[#11] Update kotlin to v2 (major) (#139)

* [#11] Update kotlin to v2 Co-authored-by: Mustafa Ozhan <[email protected]> * [#11] Update kotlin to v2 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mustafa Ozhan <[email protected]>
Oztechan · May 31, 2024 · c1cba68 · c1cba68
1 parent 98770af
commit c1cba68
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/android/android.gradle.kts b/android/android.gradle.kts
@@ -3,6 +3,7 @@ plugins {
         alias(androidApplication)
         alias(kotlinAndroid)
         alias(jetbrainsCompose)
+        alias(kotlinPluginCompose)
     }
 }
 
@@ -27,9 +28,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
 }
 
 dependencies {

diff --git a/client/client.gradle.kts b/client/client.gradle.kts
@@ -5,6 +5,7 @@ plugins {
         alias(kotlinMultiplatform)
         alias(jetbrainsCompose)
         alias(androidLibrary)
+        alias(kotlinPluginCompose)
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,23 +1,22 @@
 [versions]
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 detekt = "1.23.6"
 kover = "0.6.1"
 jetbrainsCompose = "1.6.10"
-composeCompiler = "1.5.14"
 androidGradlePlugin = "8.4.1"
 activityCompose = "1.9.0"
 
 [libraries]
 # COMMON
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-common-ComposeCompiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" } # Workaround for compose compiler update
 common-detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 
 # ANDROID
 android-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 
 [plugins]
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" }
+kotlinPluginCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 androidApplication = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }