From 2e0915c082b18f3cf1c7bf7a70fcf3e2237d68fb Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Tue, 25 Nov 2025 21:00:44 +0100
Subject: [PATCH] Bump android build versions

---
 android/build.gradle                             | 6 +++---
 android/gradle.properties                        | 1 -
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 android/settings.gradle                          | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index ddb8ad0b..0069540f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -17,19 +17,19 @@ subprojects {
     afterEvaluate { project ->
         if (project.extensions.findByName("android") != null) {
             Integer pluginCompileSdk = project.android.compileSdk
-            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
+            if (pluginCompileSdk != null && pluginCompileSdk < 34) {
                 project.logger.error(
                         "Warning: Overriding compileSdk version in Flutter plugin: "
                                 + project.name
                                 + " from "
                                 + pluginCompileSdk
-                                + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
+                                + " to 36 (to work around https://issuetracker.google.com/issues/199180389)."
                                 + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
                                 + project.name
                                 + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
                 )
                 project.android {
-                    compileSdk 34
+                    compileSdk 36
                 }
             }
         }
diff --git a/android/gradle.properties b/android/gradle.properties
index 399dfe11..f622fd8f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx2048M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index d5ce57cb..472e5d51 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index ed68c2f2..d7f1a044 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.20" apply false
+    id "com.android.application" version "8.13.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.21" apply false
 }
 
 include ":app"