Merge branch 'dev' into 367-get-rid-of-commons

bitfireAT · Jul 29, 2024 · 779dec2 · 779dec2
2 parents 5338f49 + 7bc1643
commit 779dec2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,6 +3,7 @@ import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 plugins {
     alias(libs.plugins.aboutLibs)
     alias(libs.plugins.android.application)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kapt)
     alias(libs.plugins.kotlin)
     alias(libs.plugins.ksp)
@@ -44,10 +45,6 @@ android {
         viewBinding = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
-
     flavorDimensions += "distribution"
     productFlavors {
         create("standard") {}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@
 plugins {
     alias(libs.plugins.aboutLibs) apply false
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kapt) apply false
     alias(libs.plugins.kotlin) apply false
     alias(libs.plugins.ksp) apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
 aboutLibs = "11.2.2"
 agp = "8.5.1"
-androidx-activityCompose = "1.9.0"
+androidx-activityCompose = "1.9.1"
 androidx-appCompat = "1.7.0"
 androidx-archCore = "2.2.0"
 androidx-core = "1.13.1"
-androidx-lifecycle = "2.8.3"
+androidx-lifecycle = "2.8.4"
 androidx-test-junit = "1.2.1"
 androidx-test-rules = "1.6.1"
 androidx-test-runner = "1.6.1"
@@ -22,9 +22,9 @@ compose-ui = "1.6.8"
 desugaring = "2.0.4"
 joda-time = "2.12.7"
 junit = "4.13.2"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.1"
-ksp = "1.9.24-1.0.20"
+ksp = "2.0.0-1.0.22"
 okhttp = "4.12.0"
 room = "2.6.1"
 
@@ -65,6 +65,7 @@ room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 [plugins]
 aboutLibs = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibs" }
 android-application = { id = "com.android.application", version.ref = "agp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }