Update Dependencies and Migrate to Kotlin 2 (#1765)

Corrections/edits and reviews always welcomed. Migrate to Kotlin 2 Updated dependencies Refreshed lock files
tiann · May 25, 2024 · dc23370 · dc23370
1 parent d686016
commit dc23370
Show file tree

Hide file tree

Showing 7 changed files with 267 additions and 221 deletions.
diff --git a/manager/app/build.gradle.kts b/manager/app/build.gradle.kts
@@ -3,6 +3,7 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 plugins {
     alias(libs.plugins.agp.app)
     alias(libs.plugins.kotlin)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.ksp)
     alias(libs.plugins.lsplugin.apksign)
     id("kotlin-parcelize")
@@ -39,10 +40,6 @@ android {
         jvmTarget = "21"
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
-
     packaging {
         jniLibs {
             useLegacyPackaging = true
@@ -116,4 +113,4 @@ dependencies {
 
     implementation(libs.markdown)
     implementation(libs.androidx.webkit)
-}
+}
diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.agp.app) apply false
     alias(libs.plugins.agp.lib) apply false
     alias(libs.plugins.kotlin) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.lsplugin.cmaker)
 }
 

diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml
@@ -1,8 +1,7 @@
 [versions]
-agp = "8.4.0"
-kotlin = "1.9.23"
-ksp = "1.9.23-1.0.20"
-compose-compiler = "1.5.11"
+agp = "8.4.1"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.21"
 compose-bom = "2024.05.00"
 lifecycle = "2.8.0"
 accompanist = "0.34.0"
@@ -25,6 +24,7 @@ agp-app = { id = "com.android.application", version.ref = "agp" }
 agp-lib = { id = "com.android.library", version.ref = "agp" }
 
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 
@@ -75,4 +75,4 @@ sheet-compose-dialogs-core = { group = "com.maxkeppeler.sheets-compose-dialogs",
 sheet-compose-dialogs-list = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "list", version.ref = "sheets-compose-dialogs" }
 sheet-compose-dialogs-input = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "input", version.ref = "sheets-compose-dialogs" }
 
-markdown = { group = "io.noties.markwon", name = "core", version.ref = "markdown" }
+markdown = { group = "io.noties.markwon", name = "core", version.ref = "markdown" }