Merge branch 'main' into spotless-ktlint

geoff-powell · Dec 18, 2023 · 5cd6e3f · 5cd6e3f
2 parents 2fe8b6f + 2d7678a
commit 5cd6e3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,10 +25,6 @@ plugins {
 
 allprojects {
   afterEvaluate {
-    extensions.findByType<ComposeExtension>()?.apply {
-      kotlinCompilerPlugin.set(libs.versions.compose.kotlin.compiler.get())
-    }
-
     extensions.findByType<com.diffplug.gradle.spotless.SpotlessExtension>()?.apply { // if you are using build.gradle.kts, instead of 'spotless {' use:
       kotlin {
         // by default the target is every '.kt' and '.kts` file in the java sourcesets
@@ -41,4 +37,4 @@ allprojects {
       }
     }
   }
-}
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,12 @@
 [versions]
 kotlin = "2.0.0-Beta1"
 agp = "8.2.0"
-compose = "1.5.11"
-androidx-compose = "1.5.4"
-ktor = "3.2.0"
+compose = "1.6.0-alpha01"
+ktor = "2.3.7"
 koin = "3.5.0"
 voyager = "1.0.0"
 sqldelight = "2.0.0"
-compose-kotlin-compiler = "1.5.4-dev1-kt2.0.0-Beta1"
+androidx-compose = "1.5.4"
 android-compileSdk = "34"
 android-targetSdk = "34"
 android-minSdk = "24"