Merge branch 'main' into renovate/sqldelight

geoff-powell · Dec 18, 2023 · 50db356 · 50db356
2 parents 2498510 + 2d7678a
commit 50db356
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,9 @@ out/
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# Kotlin
+.kotlin/
+
 # Gradle and Maven with auto-import
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,11 +21,3 @@ plugins {
   alias(libs.plugins.ksp) apply false
   alias(libs.plugins.sqldelight) apply false
 }
-
-allprojects {
-  afterEvaluate {
-    extensions.findByType<ComposeExtension>()?.apply {
-      kotlinCompilerPlugin.set(libs.versions.compose.kotlin.compiler.get())
-    }
-  }
-}
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.1"
-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"