Update Kotlin to 2.0.0

serbelga · May 24, 2024 · bf43d85 · bf43d85
1 parent 16c160f
commit bf43d85
Show file tree

Hide file tree

Showing 12 changed files with 547 additions and 300 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,6 @@ local.properties
 ## Xcode 8 and earlier
 *.xcscmblueprint
 *.xccheckout
+/.kotlin/
+/sample-mpp/.kotlin/
+/sample/.kotlin/
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.kotlin) apply false
 }
diff --git a/compose-vectorize-core/build.gradle.kts b/compose-vectorize-core/build.gradle.kts
@@ -18,6 +18,7 @@ import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
     kotlin("multiplatform")
+    alias(libs.plugins.composeCompiler)
     alias(libs.plugins.composeMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.vanniktechMavenPublish)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,12 +5,11 @@ androidCore = "1.13.1"
 androidMinSdk = "24"
 androidTargetSdk = "34"
 androidGradlePlugin = "8.4.1"
-composeBom = "2024.04.00"
-composeCompiler = "1.5.11"
-composeMultiplatform = "1.6.1"
+composeBom = "2024.05.00"
+composeMultiplatform = "1.6.10"
 composeVectorize = "0.7.0"
 gradlePublishGradlePlugin = "1.2.1"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 kotlinpoet = "1.16.0"
 ktlint = "0.50.0"
 paparazzi = "1.3.4"
@@ -41,6 +40,7 @@ xmlpull = { module = "xmlpull:xmlpull", version = "1.1.3.1" }
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
 gradlePublish = { id = "com.gradle.plugin-publish", version.ref = "gradlePublishGradlePlugin" }
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

diff --git a/sample-mpp/android/build.gradle.kts b/sample-mpp/android/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     alias(libs.plugins.androidApplication)
+    alias(libs.plugins.composeCompiler)
     alias(libs.plugins.kotlin)
     id("dev.sergiobelda.gradle.spotless")
 }
@@ -52,9 +53,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/sample-mpp/build.gradle.kts b/sample-mpp/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.composeMultiplatform) apply false
     alias(libs.plugins.kotlin) apply false
 }
diff --git a/sample-mpp/common/build.gradle.kts b/sample-mpp/common/build.gradle.kts
@@ -17,6 +17,7 @@
 plugins {
     kotlin("multiplatform")
     alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.composeCompiler)
     alias(libs.plugins.composeMultiplatform)
     id("dev.sergiobelda.compose.vectorize")
     id("dev.sergiobelda.gradle.spotless")

diff --git a/sample-mpp/desktop/build.gradle.kts b/sample-mpp/desktop/build.gradle.kts
@@ -18,6 +18,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     kotlin("multiplatform")
+    alias(libs.plugins.composeCompiler)
     alias(libs.plugins.composeMultiplatform)
     id("dev.sergiobelda.gradle.spotless")
 }

diff --git a/sample-mpp/kotlin-js-store/yarn.lock b/sample-mpp/kotlin-js-store/yarn.lock
diff --git a/sample-mpp/web/build.gradle.kts b/sample-mpp/web/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     kotlin("multiplatform")
+    alias(libs.plugins.composeCompiler)
     alias(libs.plugins.composeMultiplatform)
     id("dev.sergiobelda.gradle.spotless")
 }

diff --git a/sample/app/build.gradle.kts b/sample/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.composeCompiler)
     id("dev.sergiobelda.compose.vectorize")
     id("dev.sergiobelda.gradle.spotless")
     alias(libs.plugins.paparazzi)
@@ -40,9 +41,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.kotlin) apply false
 }