build: 更新 kotlin 依赖, AGP 版本

Author: Itsusinn

app/build.gradle.kts

@@ -1,12 +1,11 @@
 plugins {
 	alias(libs.plugins.android.application)
-	alias(libs.plugins.kotlin.android)
 	alias(libs.plugins.kotlin.compose)
 	alias(libs.plugins.ksp)
 	alias(libs.plugins.ktlint)
 }
 
-val baseVersionName = "0.3.2"
+val baseVersionName = "0.3.3"
 val Project.verName: String get() = "${baseVersionName}$versionNameSuffix.${exec("git rev-parse --short HEAD")}"
 val Project.verCode: Int get() = exec("git rev-list --count HEAD").toInt()
 val Project.isDevVersion: Boolean get() = exec("git tag -l v$baseVersionName").isEmpty()
@@ -27,11 +26,11 @@ android {
 	val keystore = env("KEYSTORE_FILE")
 
 	namespace = "rs.clash.android"
-	compileSdk = 36
+	compileSdk = 37
 	defaultConfig {
 		applicationId = "rs.clash.android"
 		minSdk = 23
-		targetSdk = 36
+		targetSdk = 37
 		versionCode = verCode
 		versionName = verName
 
@@ -80,6 +79,7 @@ android {
 	}
 	buildFeatures {
 		compose = true
+		resValues = true
 	}
 	splits {
 		abi {

core/build.gradle.kts

@@ -2,19 +2,19 @@ import groovy.json.JsonSlurper
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 	alias(libs.plugins.rust.android)
 }
 
 android {
     namespace = "rs.clash.android.ffi"
-    compileSdk = 36
+    compileSdk = 37
 
     ndkVersion = rootProject.extra["ndkVersion"] as String
+    buildToolsVersion = rootProject.extra["buildToolsVersion"] as String
     defaultConfig {
         minSdk = 23
-
+		compileSdk = 37
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -28,6 +28,15 @@ android {
     }
 }
 
+androidComponents {
+    onVariants { variant ->
+        val variantName = variant.name.replaceFirstChar(Char::titlecase)
+        tasks
+            .matching { it.name == "compile${variantName}Kotlin" || it.name == "compile${variantName}JavaWithJavac" }
+            .configureEach { dependsOn("cargoBuild") }
+    }
+}
+
 kotlin {
     jvmToolchain(25)
 }
@@ -62,21 +71,3 @@ cargo {
     profile = "release"
 }
 
-android {
-    buildToolsVersion = rootProject.extra["buildToolsVersion"] as String
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_25
-        targetCompatibility = JavaVersion.VERSION_25
-    }
-	libraryVariants.all {
-		val variantName = name.replaceFirstChar(Char::titlecase)
-
-		// Make Java compilation depend on generating UniFFI bindings
-		javaCompileProvider.get().dependsOn("cargoBuild")
-
-		// Also hook into Kotlin compilation
-		tasks.named("compile${variantName}Kotlin").configure {
-			dependsOn("cargoBuild")
-		}
-	}
-}

gradle.properties

@@ -5,7 +5,11 @@ org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=false
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
 android.experimental.enableArtProfiles=true
 
 kotlin.code.style=official
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.builtInKotlin=true
+android.newDsl=true

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
-agp = "8.13.2"
+agp = "9.2.0"
 kotlin = "2.3.21"
 rust-android-gradle = "0.10.1"
-coreKtx = "1.17.0"
+coreKtx = "1.18.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.12.2"
-composeBom = "2026.01.00"
+activityCompose = "1.13.0"
+composeBom = "2026.04.01"
 androidx-appcompat = "1.7.1"
-runtime = "1.10.1"
+runtime = "1.11.0"
 composeDestinations = "2.3.0"
 ksp-plugin = "2.3.4"
-ktlint = "14.0.1"
+ktlint = "14.2.0"
 compose = "1.7.8"
 material3 = "1.4.0"
-ktlint-compose = "0.5.3"
+ktlint-compose = "0.5.8"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME