From 3cca5c2be88bbd52139e7dda371e88510d28bc8e Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.app>
Date: Thu, 30 May 2024 16:56:11 -0300
Subject: [PATCH] chore(cli): update to new buildConfig format (#9924)

* chore(cli): update to new buildConfig format

the existing usage has been deprecated and will be removed on gradle plugin v9, as Android Studio warns

* add config to our lib too
---
 .changes/android-warning.md                                 | 6 ++++++
 core/tauri/mobile/android/build.gradle.kts                  | 3 +++
 tooling/cli/templates/mobile/android/app/build.gradle.kts   | 3 +++
 .../cli/templates/mobile/android/buildSrc/build.gradle.kts  | 2 +-
 tooling/cli/templates/mobile/android/gradle.properties      | 1 -
 5 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 .changes/android-warning.md

diff --git a/.changes/android-warning.md b/.changes/android-warning.md
new file mode 100644
index 000000000..1bb320407
--- /dev/null
+++ b/.changes/android-warning.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:changes
+"@tauri-apps/cli": patch:changes
+---
+
+Migrate to new Android buildFeatures.buildConfig format.
diff --git a/core/tauri/mobile/android/build.gradle.kts b/core/tauri/mobile/android/build.gradle.kts
index 533c5fd0c..fa834310e 100644
--- a/core/tauri/mobile/android/build.gradle.kts
+++ b/core/tauri/mobile/android/build.gradle.kts
@@ -31,6 +31,9 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
diff --git a/tooling/cli/templates/mobile/android/app/build.gradle.kts b/tooling/cli/templates/mobile/android/app/build.gradle.kts
index ed6331d03..c29afc0e7 100644
--- a/tooling/cli/templates/mobile/android/app/build.gradle.kts
+++ b/tooling/cli/templates/mobile/android/app/build.gradle.kts
@@ -50,6 +50,9 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 rust {
diff --git a/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts b/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts
index 099feff75..5d4cf37e2 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.0.0")
+    implementation("com.android.tools.build:gradle:8.3.2")
 }
 
diff --git a/tooling/cli/templates/mobile/android/gradle.properties b/tooling/cli/templates/mobile/android/gradle.properties
index 022338b78..2a7ec6959 100644
--- a/tooling/cli/templates/mobile/android/gradle.properties
+++ b/tooling/cli/templates/mobile/android/gradle.properties
@@ -21,5 +21,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
\ No newline at end of file