Update kotlin monorepo to v2

subroh0508 · Jul 21, 2024 · a11faef · a11faef
1 parent b6ed402
commit a11faef
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 8 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("android-application")
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.google.services)
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.mpp) apply false
     alias(libs.plugins.jetbrains.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlinx.serialization) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.android.application) apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [versions]
-kotlin = "1.7.20"
-compose = "1.2.1"
+kotlin = "2.0.0"
+compose = "1.7.0-dev1703"
 
 agp = "7.4.2"
 google-services-plugin = "4.3.14"
 
-kotlinx-coroutines = "1.6.4"
-kotlinx-serialization = "1.4.1"
+kotlinx-coroutines = "1.8.1"
+kotlinx-serialization = "1.7.1"
 
-ktor = "2.1.3"
+ktor = "2.3.12"
 
 decompose = "1.0.0"
 
-koin = "3.2.2"
+koin = "3.5.6"
 
 androidx-core = "1.3.2"
 androidx-annotation = "1.8.0"
@@ -28,7 +28,7 @@ okhttp3 = "4.9.3"
 kotlin-wrappers = "1.0.0-pre.779"
 
 mockk = "1.13.2"
-kotest = "5.5.4"
+kotest = "5.9.1"
 
 node = "16.14.2"
 yarn = "1.22.18"
@@ -42,7 +42,7 @@ npm-i18next-http-backend = "^2.0.1"
 kotlin-mpp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
-# compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

diff --git a/shared/components/core/build.gradle.kts b/shared/components/core/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("shared")
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/shared/features/home/build.gradle.kts b/shared/features/home/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("shared-features")
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/shared/features/myidols/build.gradle.kts b/shared/features/myidols/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("shared-features")
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/shared/features/preview/build.gradle.kts b/shared/features/preview/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("shared-features")
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/shared/features/search/build.gradle.kts b/shared/features/search/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("shared-features")
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/web/app/build.gradle.kts b/web/app/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 plugins {
     alias(libs.plugins.kotlin.mpp)
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/web/catalog/build.gradle.kts b/web/catalog/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 plugins {
     alias(libs.plugins.kotlin.mpp)
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {

diff --git a/web/material/build.gradle.kts b/web/material/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.mpp)
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {