chore: migrate to Kotlin 2.0

Lyxot · May 24, 2024 · d140667 · d140667
1 parent f798085
commit d140667
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -20,6 +20,7 @@ updates:
           - "org.jetbrains.kotlin.android"
           - "org.jetbrains.kotlin:kotlin-gradle-plugin"
           - "org.jetbrains.kotlin:kotlin-bom"
+          - "org.jetbrains.kotlin.plugin.compose"
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
     id("com.android.application")
     id("com.didiglobal.booster")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("com.google.protobuf")
     id("io.gitlab.arturbosch.detekt")
     id("org.lsposed.lsplugin.jgit") version "1.1"
@@ -118,9 +119,6 @@ android {
         aidl = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -175,7 +173,7 @@ android {
 dependencies {
 //    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.5")
     implementation("androidx.core:core-ktx:1.13.1")
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.23"))
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.0"))
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
     implementation("androidx.activity:activity-compose:1.9.0")
     implementation(platform("androidx.compose:compose-bom:2024.05.00"))

diff --git a/build.gradle b/build.gradle
@@ -32,6 +32,7 @@ plugins {
     id 'com.android.application' version '8.4.1' apply false
     id 'com.android.library' version '8.4.1' apply false
     id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
+    id 'org.jetbrains.kotlin.plugin.compose' version '2.0.0' apply false
     id 'io.gitlab.arturbosch.detekt' version '1.23.6'
 }