Merge pull request #3 from hicka04/bump-kotlin

Bump Kotlin to 2.0.0
hicka04 · Jun 10, 2024 · 88658da · 88658da
2 parents b5946bf + 0e78e79
commit 88658da
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@
 .gradle/
 build/
 
+# Kotlin
+.kotlin/
+
 # Local configuration file (sdk path, etc)
 local.properties
 

diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
@@ -2,6 +2,7 @@
 plugins {
     alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.com.android.application)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 android {
@@ -17,9 +18,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.org.jetbrains.kotlin.android) apply false
     alias(libs.plugins.org.jetbrains.kotlin.multiplatform) apply false
     alias(libs.plugins.org.jetbrains.kotlin.plugin.serialization) apply false
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose) apply false
     alias(libs.plugins.co.touchlab.skie) apply false
     alias(libs.plugins.org.kodein.mock.mockmp) apply false
 }

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -2,6 +2,7 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 android {
@@ -17,9 +18,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     buildTypes {
         release {
             isMinifyEnabled = false

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -2,6 +2,7 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 android {
@@ -17,9 +18,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     buildTypes {
         release {
             isMinifyEnabled = false

diff --git a/feature/pokemon_detail/build.gradle.kts b/feature/pokemon_detail/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.com.google.devtools.ksp)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 android {
@@ -18,9 +19,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     buildTypes {
         release {
             isMinifyEnabled = false

diff --git a/feature/pokemon_list/build.gradle.kts b/feature/pokemon_list/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.com.google.devtools.ksp)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 android {
@@ -18,9 +19,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     buildTypes {
         release {
             isMinifyEnabled = false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,16 +5,15 @@ sdk-target = "34"
 sdk-min = "26"
 jvm = "1.8"
 agp = "8.2.2"
-kotlin = "1.9.20"
-ksp = "1.9.20-1.0.14"
-skie = "0.5.5"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.22"
+skie = "0.8.2"
 mockmp = "1.15.0"
 
 # libraries
 ## main
 coroutines = "1.7.3"
 compose = "2024.01.00"
-compose-compiler = "1.5.4"
 activity-compose = "1.8.2"
 lifecycle = "2.7.0"
 navigation = "2.7.6"
@@ -70,6 +69,7 @@ com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp"
 org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 org-jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 org-jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 co-touchlab-skie = { id = "co.touchlab.skie", version.ref = "skie" }
 org-kodein-mock-mockmp = { id = "org.kodein.mock.mockmp", version.ref = "mockmp" }