From 0181d934a04842b03ed13c955068d81d39fc2a32 Mon Sep 17 00:00:00 2001
From: FabianLars <fabianlars@fabianlars.de>
Date: Tue, 6 Aug 2024 15:59:41 +0200
Subject: [PATCH 1/2] feat(cli): Upgrade gradle to 8.9 and gradle-android to
 8.5.1

---
 .changes/android-gradle-8-9.md                              | 6 ++++++
 tooling/cli/templates/mobile/android/build.gradle.kts       | 4 ++--
 .../cli/templates/mobile/android/buildSrc/build.gradle.kts  | 2 +-
 .../mobile/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .changes/android-gradle-8-9.md

diff --git a/.changes/android-gradle-8-9.md b/.changes/android-gradle-8-9.md
new file mode 100644
index 000000000000..ac4227fe853e
--- /dev/null
+++ b/.changes/android-gradle-8-9.md
@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:enhance'
+'@tauri-apps/cli': 'patch:enhance'
+---
+
+Update gradle to 8.9 and the gradle android plugin to 8.5.1 in the android templates. This should add support for Java 21 but Java 17 keeps being the recommended version.
diff --git a/tooling/cli/templates/mobile/android/build.gradle.kts b/tooling/cli/templates/mobile/android/build.gradle.kts
index 35b4f5cdfd5c..0bf63ab7d9f6 100644
--- a/tooling/cli/templates/mobile/android/build.gradle.kts
+++ b/tooling/cli/templates/mobile/android/build.gradle.kts
@@ -4,8 +4,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.3.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+        classpath("com.android.tools.build:gradle:8.5.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
         {{~#each android-project-dependencies}}
         classpath("{{this}}"){{/each}}
     }
diff --git a/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts b/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts
index 5d4cf37e26b8..39e90b05430f 100644
--- a/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts
+++ b/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts
@@ -18,6 +18,6 @@ repositories {
 
 dependencies {
     compileOnly(gradleApi())
-    implementation("com.android.tools.build:gradle:8.3.2")
+    implementation("com.android.tools.build:gradle:8.5.1")
 }
 
diff --git a/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties b/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties
index a03ce6aa2d62..0df10d556cca 100644
--- a/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties
+++ b/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue May 10 19:22:52 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 6afad1389db8c5d7bba79bdfe3487ec5650ee1de Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.app>
Date: Thu, 8 Aug 2024 08:09:48 -0300
Subject: [PATCH 2/2] Update .changes/android-gradle-8-9.md

---
 .changes/android-gradle-8-9.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changes/android-gradle-8-9.md b/.changes/android-gradle-8-9.md
index ac4227fe853e..c0b5991b435d 100644
--- a/.changes/android-gradle-8-9.md
+++ b/.changes/android-gradle-8-9.md
@@ -3,4 +3,4 @@
 '@tauri-apps/cli': 'patch:enhance'
 ---
 
-Update gradle to 8.9 and the gradle android plugin to 8.5.1 in the android templates. This should add support for Java 21 but Java 17 keeps being the recommended version.
+Update gradle to 8.9 and the gradle android plugin to 8.5.1 in the android templates (requires latest Android Studio). This should add support for Java 21 but Java 17 keeps being the recommended version.