👍 Update Alkaa to use K2

Alkaa updated to use the second version of the Kotlin Compiler. Compose was also updated to use the one from the Kotlin repository.
igorescodro · May 19, 2024 · 3597e99 · 3597e99
1 parent 33b64a4
commit 3597e99
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 11 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("kotlin-android")
     id("com.escodro.kotlin-quality")
     id("com.mikepenz.aboutlibraries.plugin")
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -64,9 +65,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
 
     packaging {
         resources.excludes.apply {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,7 @@
 plugins {
     alias(libs.plugins.dependencyanalysis)
+    alias(libs.plugins.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 buildscript {
     repositories {

diff --git a/features/category/build.gradle.kts b/features/category/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("com.escodro.multiplatform")
     id("kotlin-parcelize")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/features/glance/build.gradle.kts b/features/glance/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.escodro.android-compose")
     alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.compose.compiler)
 }
 
 dependencies {

diff --git a/features/home/build.gradle.kts b/features/home/build.gradle.kts
@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 plugins {
     id("com.escodro.multiplatform")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/features/preference/build.gradle.kts b/features/preference/build.gradle.kts
@@ -6,6 +6,7 @@ import extension.setFrameworkBaseName
 plugins {
     id("com.escodro.multiplatform")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/features/search/build.gradle.kts b/features/search/build.gradle.kts
@@ -5,6 +5,7 @@ import extension.setFrameworkBaseName
 plugins {
     id("com.escodro.multiplatform")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/features/task/build.gradle.kts b/features/task/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("com.escodro.multiplatform")
     id("kotlin-parcelize")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/features/tracker/build.gradle.kts b/features/tracker/build.gradle.kts
@@ -6,6 +6,7 @@ import extension.setFrameworkBaseName
 plugins {
     id("com.escodro.android-dynamic")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 version_code = "30006"
 version_name = "3.0.6"
 android_gradle_plugin = "8.4.0"
-kotlin = "1.9.23"
+kotlin = "2.0.0-RC3"
 android_sdk_compile = "34"
 android_sdk_target = "33"
 android_sdk_min = "24"
@@ -34,10 +34,9 @@ workmanager = "2.9.0"
 lifecycle_viewmodel = "2.8.0"
 
 # Compose
-compose_compiler = "1.5.12"
 compose_bom = "2024.05.00"
 compose_activity = "1.9.0"
-jb_compose_compiler = "1.6.2"
+jb_compose_compiler = "1.6.10-rc02"
 compose_windowsizeclass = "0.5.0"
 
 # Koin
@@ -176,3 +175,6 @@ dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.re
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 compose = { id = "org.jetbrains.compose", version.ref = "jb_compose_compiler" }
 moko_multiplatform_resources = { id = "dev.icerock.mobile.multiplatform-resources" }
+
+compose_compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/libraries/appstate/build.gradle.kts b/libraries/appstate/build.gradle.kts
@@ -4,6 +4,7 @@ import extension.setFrameworkBaseName
 plugins {
     id("com.escodro.multiplatform")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts
@@ -4,6 +4,7 @@ import extension.setFrameworkBaseName
 plugins {
     id("com.escodro.multiplatform")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/libraries/navigation/build.gradle.kts b/libraries/navigation/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     id("com.escodro.multiplatform")
     id("kotlin-parcelize")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/libraries/splitInstall/build.gradle.kts b/libraries/splitInstall/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id("com.escodro.android-compose")
+    alias(libs.plugins.compose.compiler)
 }
 
 dependencies {

diff --git a/plugins/src/main/java/extension/CommonExtension.kt b/plugins/src/main/java/extension/CommonExtension.kt
@@ -22,10 +22,6 @@ fun CommonExtension<*, *, *, *, *, *>.composeConfig(libs: VersionCatalog) {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.composeVersion
-    }
-
     packaging {
         resources.excludes.apply {
             add("META-INF/AL2.0")
@@ -43,4 +39,3 @@ fun LibraryExtension.proguardConfig() {
         }
     }
 }
-
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 plugins {
     id("com.escodro.multiplatform")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     id(libs.plugins.moko.multiplatform.resources.get().pluginId) // Use version from classpath
 }