From a5fca960dc1ff0aa73987450166b757bf0b9a5e3 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 1 Aug 2025 10:47:40 -0700
Subject: [PATCH] Update gradle and dependencies

---
 app/buildSrc/build.gradle.kts                |  6 ------
 app/buildSrc/src/main/java/Stub.kt           |  4 ++--
 app/core/proguard-rules.pro                  |  1 +
 app/gradle/libs.versions.toml                | 12 ++++++------
 app/gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/buildSrc/build.gradle.kts b/app/buildSrc/build.gradle.kts
index 632bd31f9..ee451efa2 100644
--- a/app/buildSrc/build.gradle.kts
+++ b/app/buildSrc/build.gradle.kts
@@ -18,12 +18,6 @@ gradlePlugin {
     }
 }
 
-kotlin {
-    compilerOptions {
-        languageVersion = KotlinVersion.KOTLIN_2_0
-    }
-}
-
 dependencies {
     implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
     implementation(libs.android.gradle.plugin)
diff --git a/app/buildSrc/src/main/java/Stub.kt b/app/buildSrc/src/main/java/Stub.kt
index 8576eae5b..f229afe44 100644
--- a/app/buildSrc/src/main/java/Stub.kt
+++ b/app/buildSrc/src/main/java/Stub.kt
@@ -309,9 +309,9 @@ fun Project.setupStubApk() {
             outputs.dir(outResDir)
             doLast {
                 val apkTmp = File("${apk}.tmp")
-                exec {
+                providers.exec {
                     commandLine(aapt, "optimize", "-o", apkTmp, "--collapse-resource-names", apk)
-                }
+                }.result.get()
 
                 val bos = ByteArrayOutputStream()
                 ZipFile(apkTmp).use { src ->
diff --git a/app/core/proguard-rules.pro b/app/core/proguard-rules.pro
index 2d6cf76a3..854ec7bb3 100644
--- a/app/core/proguard-rules.pro
+++ b/app/core/proguard-rules.pro
@@ -38,3 +38,4 @@
 -allowaccessmodification
 
 -dontwarn org.junit.**
+-dontwarn org.apache.**
diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml
index 54f47aaff..4f34e050e 100644
--- a/app/gradle/libs.versions.toml
+++ b/app/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 kotlin = "2.2.0"
-android = "8.11.1"
+android = "8.12.0"
 ksp = "2.2.0-2.0.2"
 rikka = "1.3.0"
-navigation = "2.9.1"
+navigation = "2.9.3"
 libsu = "6.0.0"
 okhttp = "5.1.0"
 retrofit = "3.0.0"
@@ -11,7 +11,7 @@ room = "2.7.2"
 
 [libraries]
 bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.81" }
-commons-compress = { module = "org.apache.commons:commons-compress", version = "1.27.1" }
+commons-compress = { module = "org.apache.commons:commons-compress", version = "1.28.0" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
@@ -41,9 +41,9 @@ transition = { module = "androidx.transition:transition", version = "1.6.0" }
 collection-ktx = { module = "androidx.collection:collection-ktx", version = "1.5.0" }
 material = { module = "com.google.android.material:material", version = "1.12.0" }
 jdk-libs = { module = "com.android.tools:desugar_jdk_libs_nio", version = "2.1.5" }
-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
-test-rules = { module = "androidx.test:rules", version = "1.6.1" }
-test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
+test-runner = { module = "androidx.test:runner", version = "1.7.0" }
+test-rules = { module = "androidx.test:rules", version = "1.7.0" }
+test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
 test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version = "2.3.0" }
 
 # topjohnwu
diff --git a/app/gradle/wrapper/gradle-wrapper.properties b/app/gradle/wrapper/gradle-wrapper.properties
index ff23a68d7..2a84e188b 100644
--- a/app/gradle/wrapper/gradle-wrapper.properties
+++ b/app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME