Upgrade Kotlin 2.0.0

Kotlin · Aug 5, 2024 · adc3fc3 · adc3fc3
1 parent 7819add
commit adc3fc3
Show file tree

Hide file tree

Showing 6 changed files with 532 additions and 293 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.pluginCompose) apply false
 }
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.pluginCompose)
 }
 
 kotlin {

diff --git a/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml b/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml
diff --git a/composeApp/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt
@@ -12,6 +12,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import compose_example.composeapp.generated.resources.Res
+import compose_example.composeapp.generated.resources.compose_multiplatform
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 
@@ -30,7 +32,7 @@ fun App() {
             }
             AnimatedVisibility(showImage) {
                 Image(
-                    painterResource("compose-multiplatform.xml"),
+                    painterResource(Res.drawable.compose_multiplatform),
                     null
                 )
             }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 compose = "1.5.4"
-compose-plugin = "1.6.0-alpha01"
-compose-compiler = "1.5.4"
+compose-plugin = "1.6.10"
 agp = "8.1.4"
 android-minSdk = "24"
 android-compileSdk = "34"
@@ -13,7 +12,7 @@ androidx-material = "1.10.0"
 androidx-constraintlayout = "2.1.4"
 androidx-test-junit = "1.1.5"
 androidx-espresso-core = "3.5.1"
-kotlin = "1.9.21"
+kotlin = "2.0.0"
 junit = "4.13.2"
 
 [libraries]
@@ -37,4 +36,5 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+pluginCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }