Merge pull request #29 from ahmedre/bump-kotlin-to-2.0

Bump kotlin to 2.0
ahmedre · Jun 30, 2024 · 045896e · 045896e
2 parents 1539376 + b0a517a
commit 045896e
Show file tree

Hide file tree

Showing 7 changed files with 575 additions and 322 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,6 @@ captures
 .externalNativeBuild
 .cxx
 local.properties
-xcuserdata
+xcuserdata
+# Kotlin 2.0
+.kotlin/
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.jetbrain.compose) apply false
+    alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.spotless) apply false
     id("convention.spotless") apply true
 }
diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
@@ -17,13 +17,10 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrain.compose)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
 }
 
-compose {
-    kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get())
-}
-
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     applyDefaultHierarchyTemplate()

diff --git a/design/build.gradle.kts b/design/build.gradle.kts
@@ -16,10 +16,7 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrain.compose)
-}
-
-compose {
-    kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get())
+    alias(libs.plugins.kotlin.compose)
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
 activity-compose = "1.9.0"
-agp = "8.4.0"
+agp = "8.4.2"
 androidx-material = "1.6.7"
 coil = "3.0.0-alpha06"
 coroutines = "1.8.1"
 foundation = "1.6.7"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 kotlinx-serialization = "1.6.3"
 ktor = "2.3.8"
-compose-compiler = "1.5.13"
-compose-jb = "1.6.1"
+compose-compiler = "1.5.14"
+compose-jb = "1.6.11"
 spotless = "6.14.0"
 
 [libraries]
@@ -48,5 +48,6 @@ android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 jetbrain-compose = { id = "org.jetbrains.compose", version.ref = "compose-jb" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/sdui/build.gradle.kts b/sdui/build.gradle.kts
@@ -17,10 +17,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrain.compose)
-}
-
-compose {
-    kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get())
+    alias(libs.plugins.kotlin.compose)
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)