feat: 升级基础库版本

build-logic/convention/src/main/kotlin/CommonLibPlugin.kt

@@ -52,8 +52,8 @@ open class CommonLibPlugin : Plugin<Project> {
                     }
                 }
                 composeOptions {
-                    kotlinCompilerExtensionVersion =
-                        libs.findVersion("kotlinCompilerExtensionVersion").get().toString()
+                    /*kotlinCompilerExtensionVersion =
+                        libs.findVersion("kotlinCompilerExtensionVersion").get().toString()*/
                 }
             }
         }

build.gradle.kts

@@ -2,7 +2,7 @@ buildscript {
 
     dependencies {
         classpath("com.android.tools.build:gradle:${libs.versions.agp}")
-        classpath(libs.kcomponent.gradleplugin)
+        classpath(libs.kcomponent.gradle.plugin)
     }
 
 }
@@ -14,4 +14,5 @@ plugins {
     id("org.jetbrains.kotlin.android") version libs.versions.kotlin apply false
     id("org.jetbrains.kotlin.jvm") version libs.versions.kotlin apply false
     id("com.google.devtools.ksp") version libs.versions.ksp apply false
+    alias(libs.plugins.compose.compiler) apply false
 }

libs.versions.toml

@@ -1,39 +1,39 @@
 [versions]
-compileSdk = "34"
-targetSdk = "34"
+compileSdk = "35"
+targetSdk = "35"
 minSdk = "21"
-xiaojinzi_android_support = "v1.0-beta222"
-compose = "1.7.3"
-lifecycle = "2.8.6"
-lottie = "6.5.2"
+xiaojinzi-android-support = "v1.0-beta225"
+compose = "1.7.5"
+lifecycle = "2.8.7"
+lottie = "6.6.0"
 kcomponent = "v1.0.8-rc5"
-kotlin = "1.9.23"
-ksp = "1.9.0-1.0.13"
+kotlin = "2.0.21"
+ksp = "2.0.21-1.0.26"
 agp = "8.2.2"
-kotlinCompilerExtensionVersion = "1.5.11"
+# kotlinCompilerExtensionVersion = "1.5.15"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.2.1"
 espresso-core = "3.6.1"
 material = "1.12.0"
 publish = "0.0.1"
 
 [libraries]
-androidx_core = { group = "androidx.core", name = "core-ktx", version = "1.13.1" }
-androidx_appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
-xiaojinzi_android_support_ktx = { group = "com.github.xiaojinzi123.AndroidSupport", name = "lib-ktx", version.ref = "xiaojinzi_android_support" }
-xiaojinzi_android_support_annotation = { group = "com.github.xiaojinzi123.AndroidSupport", name = "lib-annotation", version.ref = "xiaojinzi_android_support" }
-xiaojinzi_android_support_compose = { group = "com.github.xiaojinzi123.AndroidSupport", name = "lib-compose", version.ref = "xiaojinzi_android_support" }
-compose_runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose" }
-compose_runtime_android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "compose" }
-compose_ui_android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "compose" }
-compose_foundation_android = { group = "androidx.compose.foundation", name = "foundation-layout-android", version.ref = "compose" }
-lifecycle_viewmodel_compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
-lottie_compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "lottie" }
-kcomponent_core = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent", version.ref = "kcomponent" }
-kcomponent_compiler = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent-compiler", version.ref = "kcomponent" }
-kcomponent_gradleplugin = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent-plugin", version.ref = "kcomponent" }
+androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.13.1" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
+xiaojinzi-android-support-ktx = { group = "com.github.xiaojinzi123.AndroidSupport", name = "lib-ktx", version.ref = "xiaojinzi-android-support" }
+xiaojinzi-android-support-annotation = { group = "com.github.xiaojinzi123.AndroidSupport", name = "lib-annotation", version.ref = "xiaojinzi-android-support" }
+xiaojinzi-android-support-compose = { group = "com.github.xiaojinzi123.AndroidSupport", name = "lib-compose", version.ref = "xiaojinzi-android-support" }
+compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose" }
+compose-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "compose" }
+compose-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "compose" }
+compose-foundation-android = { group = "androidx.compose.foundation", name = "foundation-layout-android", version.ref = "compose" }
+lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "lottie" }
+kcomponent-core = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent", version.ref = "kcomponent" }
+kcomponent-compiler = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent-compiler", version.ref = "kcomponent" }
+kcomponent-gradle-plugin = { group = "com.github.xiaojinzi123.KComponent", name = "kcomponent-plugin", version.ref = "kcomponent" }
 
-gradle-kotlin-dsl-plugin = { group = "org.gradle.kotlin", name = "gradle-kotlin-dsl-plugins", version = "4.4.0" }
+gradle-kotlin-dsl-plugin = { group = "org.gradle.kotlin", name = "gradle-kotlin-dsl-plugins", version = "4.5.0" }
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }
 kotlin-gradlePlugin-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api", version.ref = "kotlin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -46,4 +46,5 @@ material = { group = "com.google.android.material", name = "material", version.r
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "agp" }
-android-library = { id ="com.android.library", version.ref = "agp" }
+android-library = { id ="com.android.library", version.ref = "agp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

reactive-demo/app/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.application")
     id("com.xiaojinzi.kcomponent.plugin")
     id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -68,7 +69,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get()
+        // kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get()
     }
 
     packaging {

reactive-template-compose/build.gradle.kts

@@ -1,8 +1,7 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-
 plugins {
     id("commonLibPlugin")
     id("androidLibraryPublishPlugin")
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -24,7 +23,7 @@ dependencies {
     api(libs.lottie.compose)
 }
 
-archivesName.set("reactive-template-compose")
+// archivesName.set("reactive-template-compose")
 
 afterEvaluate {
     publishing {

reactive-template/build.gradle.kts

@@ -1,15 +1,10 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-
 plugins {
     id("commonLibPlugin")
     id("androidLibraryPublishPlugin")
 }
 
 android {
     namespace = "com.xiaojinzi.reactive.template"
-    buildFeatures {
-        compose = true
-    }
 }
 
 dependencies {
@@ -24,7 +19,7 @@ dependencies {
     api(libs.lottie.compose)
 }
 
-archivesName.set("reactive-template")
+// archivesName.set("reactive-template")
 
 afterEvaluate {
     publishing {

reactive/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-
 plugins {
     id("commonLibPlugin")
     id("androidLibraryPublishPlugin")
@@ -19,7 +17,7 @@ dependencies {
 
 }
 
-archivesName.set("reactive-core")
+// archivesName.set("reactive-core")
 
 afterEvaluate {
     publishing {