Update gradle and dependencies

This commit is contained in:
topjohnwu
2025-08-01 10:47:40 -07:00
committed by John Wu
parent f99912b9db
commit a5fca960dc
5 changed files with 10 additions and 15 deletions

View File

@@ -18,12 +18,6 @@ gradlePlugin {
} }
} }
kotlin {
compilerOptions {
languageVersion = KotlinVersion.KOTLIN_2_0
}
}
dependencies { dependencies {
implementation(kotlin("gradle-plugin", libs.versions.kotlin.get())) implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
implementation(libs.android.gradle.plugin) implementation(libs.android.gradle.plugin)

View File

@@ -309,9 +309,9 @@ fun Project.setupStubApk() {
outputs.dir(outResDir) outputs.dir(outResDir)
doLast { doLast {
val apkTmp = File("${apk}.tmp") val apkTmp = File("${apk}.tmp")
exec { providers.exec {
commandLine(aapt, "optimize", "-o", apkTmp, "--collapse-resource-names", apk) commandLine(aapt, "optimize", "-o", apkTmp, "--collapse-resource-names", apk)
} }.result.get()
val bos = ByteArrayOutputStream() val bos = ByteArrayOutputStream()
ZipFile(apkTmp).use { src -> ZipFile(apkTmp).use { src ->

View File

@@ -38,3 +38,4 @@
-allowaccessmodification -allowaccessmodification
-dontwarn org.junit.** -dontwarn org.junit.**
-dontwarn org.apache.**

View File

@@ -1,9 +1,9 @@
[versions] [versions]
kotlin = "2.2.0" kotlin = "2.2.0"
android = "8.11.1" android = "8.12.0"
ksp = "2.2.0-2.0.2" ksp = "2.2.0-2.0.2"
rikka = "1.3.0" rikka = "1.3.0"
navigation = "2.9.1" navigation = "2.9.3"
libsu = "6.0.0" libsu = "6.0.0"
okhttp = "5.1.0" okhttp = "5.1.0"
retrofit = "3.0.0" retrofit = "3.0.0"
@@ -11,7 +11,7 @@ room = "2.7.2"
[libraries] [libraries]
bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.81" } 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 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", 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" } 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" } collection-ktx = { module = "androidx.collection:collection-ktx", version = "1.5.0" }
material = { module = "com.google.android.material:material", version = "1.12.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" } 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-runner = { module = "androidx.test:runner", version = "1.7.0" }
test-rules = { module = "androidx.test:rules", version = "1.6.1" } test-rules = { module = "androidx.test:rules", version = "1.7.0" }
test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" } test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version = "2.3.0" } test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version = "2.3.0" }
# topjohnwu # topjohnwu

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME