升级 Kotlin 到 2.0+

app/build.gradle

@@ -1,7 +1,10 @@
-apply plugin: 'com.android.application'
-apply plugin: 'com.xiaojinzi.kcomponent.plugin'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.devtools.ksp'
+plugins {
+    id 'com.android.application'
+    alias(libs.plugins.compose.compiler)
+    id "com.xiaojinzi.kcomponent.plugin"
+    id "kotlin-android"
+    id "com.google.devtools.ksp"
+}
 
 apply from: "../common_lib.gradle"
 
@@ -43,10 +46,7 @@ android {
     buildFeatures {
         // Enables Jetpack Compose for this module
         compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.kotlin.compiler.extension.get()
-        kotlinCompilerVersion libs.versions.kotlin.asProvider().get()
+        buildConfig true
     }
 
     buildTypes {

build.gradle

@@ -14,7 +14,8 @@ buildscript {
 }
 
 plugins {
-    id "com.google.devtools.ksp" version libs.versions.kotlin.ksp apply false
+    alias(libs.plugins.kotlin.ksp) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 tasks.register('clean', Delete) {

gradle.properties

@@ -20,5 +20,4 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # close ksp incremental
-ksp.incremental=false
-android.defaults.buildfeatures.buildconfig=true
+ksp.incremental=false

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 compileSdkVersion = "35"
-gradleVersion = "8.2.2"
+gradleVersion = "8.7.2"
 minSdkVersion = "21"
 targetSdkVersion = "35"
 component = "8c968cf766"
@@ -9,10 +9,10 @@ compose_kotlin_compiler_extension = "1.5.15"
 compose_material_version = "1.7.5"
 compose_material3_version = "1.3.1"
 accompanist_version = "0.36.0"
-kotlin = "1.9.25"
-# kotlin = "2.0.20"
-kotlin_ksp = "1.9.25-1.0.20"
-# kotlin_ksp = "2.0.20-1.0.25"
+# kotlin = "1.9.25"
+kotlin = "2.0.21"
+# kotlin_ksp = "1.9.25-1.0.20"
+kotlin_ksp = "2.0.21-1.0.26"
 kotlin_coroutines = "1.9.0"
 
 [libraries]
@@ -65,3 +65,7 @@ component_compiler = { group = "com.github.xiaojinzi123.KComponent", name = "kco
 component_impl = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent", version.ref = "component" }
 component_impl_rx = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent-rx", version.ref = "component" }
 component_plugin = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent-plugin", version.ref = "component" }
+
+[plugins]
+kotlin-ksp = {id = "com.google.devtools.ksp", version.ref = "kotlin_ksp"}
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

lib-compose/build.gradle

@@ -1,6 +1,9 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
+plugins {
+    id "com.android.library"
+    alias(libs.plugins.compose.compiler)
+    id "kotlin-android"
+    id "maven-publish"
+}
 
 apply from: "../common_lib.gradle"
 
@@ -12,10 +15,6 @@ android {
         // Enables Jetpack Compose for this module
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.kotlin.compiler.extension.get()
-        kotlinCompilerVersion libs.versions.kotlin.asProvider().get()
-    }
     namespace 'com.xiaojinzi.support.compose'
 }