Merge pull request #134 from ml-opensource/build/kotlin-v2

build: upgrade kotlin to version 2
ml-opensource · May 22, 2024 · 62c395d · 62c395d
2 parents cdc4c04 + f3e5334
commit 62c395d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 41 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
     alias(libs.plugins.convention.android.application)
-    alias(libs.plugins.convention.android.compose)
+    alias(libs.plugins.kotlin.compose.compiler)
 }
 
 
@@ -64,6 +64,10 @@ android {
             excludes.add("META-INF/LICENSE-notice.md")
         }
     }
+
+    buildFeatures {
+        compose = true
+    }
 }
 
 kotlin {

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -24,9 +24,6 @@ gradlePlugin {
             id = "convention.android.application"
             implementationClass = "com.monstarlab.convention.AndroidAppConventionPlugin"
         }
-        register("conventionCompose") {
-            id = "convention.android.compose"
-            implementationClass = "com.monstarlab.convention.ComposeConventionPlugin"
-        }
+
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/com/monstarlab/convention/ComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/com/monstarlab/convention/ComposeConventionPlugin.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,11 +15,11 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.convention.android.library) apply false
     alias(libs.plugins.convention.android.application) apply false
-    alias(libs.plugins.convention.android.compose) apply false
     alias(libs.plugins.detekt) apply false
     alias(libs.plugins.spotless)
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.kotlin.compose.compiler) apply false
 }
 
 allprojects {

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -6,14 +6,15 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.convention.android.library)
-    alias(libs.plugins.convention.android.compose)
-
+    alias(libs.plugins.kotlin.compose.compiler)
 }
 
 android {
     namespace = "com.monstarlab.core"
+    buildFeatures.compose = true
 }
 
+
 kotlin {
     jvmToolchain(17)
 }

diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts
@@ -3,12 +3,13 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.convention.android.library)
-    alias(libs.plugins.convention.android.compose)
-
+    alias(libs.plugins.kotlin.compose.compiler)
 }
 
 android {
     namespace = "com.monstarlab.designsystem"
+    buildFeatures.compose = true
+
 }
 
 kotlin {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,11 @@
 [versions]
 nstack = "3.3.0"
-kotlin = "1.9.24"
-ksp = "1.9.24-1.0.20"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.21"
 kotlin_coroutines = "1.8.1"
 retrofit = "2.11.0"
 okhttp = "4.12.0"
 compose_bom = "2024.05.00"
-compose_compiler = "1.5.14"
 hilt = "2.51.1"
 lifecycle = "2.7.0"
 navigation = "2.7.7"
@@ -27,12 +26,14 @@ kotlin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 android-application = { id = "com.android.application", version.ref = "android_gradle" }
 android_library = { id = "com.android.library", version.ref = "android_gradle" }
 kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+
+
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 nstack = { id = "dk.nodes.nstack.plugin", version.ref = "nstack" }
 convention-android-library = { id = "convention.android.library", version = "unspecified" }
 convention-android-application = { id = "convention.android.application", version = "unspecified" }
-convention-android-compose = { id = "convention.android.compose", version = "unspecified" }
 
 [libraries]
 #-------------------------