Migrate to Kotlin 2.0 (#336)

* K2 * K2
michaelbel · May 25, 2024 · 5d33832 · 5d33832
1 parent 3199b54
commit 5d33832
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 95 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.konan.properties.Properties
 @Suppress("dsl_scope_violation")
 
 plugins {
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.androidx.navigation.safeargs)
@@ -143,10 +144,6 @@ android {
 
     /*dynamicFeatures += setOf(":instant")*/
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.kotlin.cocoapods) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
+    alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.google.ksp) apply false
     alias(libs.plugins.google.services) apply false

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -56,10 +57,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/core/interactor/build.gradle.kts b/core/interactor/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
 }

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -57,10 +58,6 @@ android {
         compileSdk = libs.versions.compile.sdk.get().toInt()
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/core/widget/build.gradle.kts b/core/widget/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.android.library)
 }
@@ -42,10 +43,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
 }
 

diff --git a/feature/account-impl/build.gradle.kts b/feature/account-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -48,10 +49,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/feature/account/build.gradle.kts b/feature/account/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -37,10 +38,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/auth-impl/build.gradle.kts b/feature/auth-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -45,10 +46,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -38,10 +39,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/debug-impl/build.gradle.kts b/feature/debug-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -39,10 +40,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/debug/build.gradle.kts b/feature/debug/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -35,10 +36,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/details-impl/build.gradle.kts b/feature/details-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -46,10 +47,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/feature/details/build.gradle.kts b/feature/details/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -38,10 +39,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/feed-impl/build.gradle.kts b/feature/feed-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -60,10 +61,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/feature/feed/build.gradle.kts b/feature/feed/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -38,10 +39,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/gallery-impl/build.gradle.kts b/feature/gallery-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -45,10 +46,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/feature/gallery/build.gradle.kts b/feature/gallery/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -38,10 +39,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/main-impl/build.gradle.kts b/feature/main-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -62,10 +63,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/feature/search-impl/build.gradle.kts b/feature/search-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -48,10 +49,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra.get("jvmTarget") as String)

diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -38,10 +39,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         quiet = true
         abortOnError = false

diff --git a/feature/settings-impl/build.gradle.kts b/feature/settings-impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
 }
@@ -51,10 +52,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11