[toolchain] upgrade kotlin to 2.0.20

& use kotlin Compose plugin & ksp `2.0.20-1.0.24`
chr56 · Aug 23, 2024 · ecf9bd0 · ecf9bd0
1 parent 80aa82a
commit ecf9bd0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,6 +8,7 @@ import java.util.Properties
 plugins {
     alias(libs.plugins.androidGradlePlugin)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.artifactsRelease)
@@ -165,10 +166,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,9 +2,9 @@
 
 ## Plugins
 
-kotlin = "1.9.22"
+kotlin = "2.0.20"
 agp = "8.5.2"
-ksp = "1.9.22-1.0.17"
+ksp = "2.0.20-1.0.24"
 versionChecker = "0.51.0"
 
 ## Libraries
@@ -28,7 +28,6 @@ room = "2.6.1"
 datastore = { strictly = "1.0.0" }
 material = "1.9.0"
 compose = "1.6.8"
-composeCompiler = "1.5.10"
 #### Jetpack End
 
 
@@ -233,6 +232,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 

diff --git a/tools/changelog-generator/build.gradle.kts b/tools/changelog-generator/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 repositories {
     mavenCentral()
@@ -107,8 +107,11 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType(KotlinCompile::class.java) {
-    (kotlinOptions as KotlinJvmOptions).jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+        apiVersion.set(KotlinVersion.KOTLIN_2_0)
+    }
 }
 
 dependencies {