Merge pull request #87 from joelkanyi/kotlin-2.0

update to kotlin 2.0.0
joelkanyi · May 24, 2024 · 004a244 · 004a244
2 parents 3b06585 + 9c1cd21
commit 004a244
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
     alias(libs.plugins.hilt.android)
     alias(libs.plugins.parcelize)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -76,9 +77,7 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
+
     sourceSets {
         getByName("androidTest").assets.srcDirs(files("$rootDir/app/schemas")) // Room
     }
@@ -90,6 +89,10 @@ android {
     }
 }
 
+composeCompiler {
+    enableStrongSkippingMode = true
+}
+
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.ui)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.kapt) apply false
     alias(libs.plugins.parcelize) apply false
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 subprojects {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,9 @@
 [versions]
-kotlin = "1.9.24"
-ksp = "1.9.24-1.0.20"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.21"
 gradle = "8.2.2"
 compose = "1.6.7"
 material3 = "1.3.0-beta01"
-compose-compiler = "1.5.14"
 hiltAndroid = "2.51.1"
 hiltCompiler = "1.2.0"
 kotlinxCoroutinesAndroid = "1.8.1"
@@ -88,3 +87,4 @@ spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }