[1.151.*] Pre-release merge (#503)

msasikanth · May 3, 2024 · 66390fb · 66390fb
2 parents abacaf5 + 0bdcb30
commit 66390fb
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 .gradle
-.kotlin
 /local.properties
 .DS_Store
 build/

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
   alias(libs.plugins.kotlin.multiplatform)
   alias(libs.plugins.android.application)
   alias(libs.plugins.compose)
-  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.ksp)
   alias(libs.plugins.bugsnag)
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,6 @@ plugins {
   alias(libs.plugins.android.application).apply(false)
   alias(libs.plugins.android.library).apply(false)
   alias(libs.plugins.compose).apply(false)
-  alias(libs.plugins.compose.compiler).apply(false)
   alias(libs.plugins.spotless).apply(false)
   alias(libs.plugins.kotlin.parcelize).apply(false)
   alias(libs.plugins.kotlin.serialization).apply(false)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-kotlin = "2.0.0-RC2"
+kotlin = "1.9.23"
 android_gradle_plugin = "8.4.0"
-compose = "1.6.10-beta03"
+compose = "1.6.2"
 
 android_sdk_compile = "34"
 android_sdk_target = "34"
@@ -28,7 +28,7 @@ coil = "3.0.0-alpha04"
 spotless = "6.25.0"
 ktfmt = "0.44"
 kotlininject = "0.6.3"
-ksp = "2.0.0-RC2-1.0.20"
+ksp = "1.9.23-1.0.20"
 material_color_utilities = "1.0.0-alpha01"
 ksoup = "0.1.2"
 sqliteAndroid = "3.45.0"
@@ -126,7 +126,6 @@ kotlin_cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref =
 kotlin_parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 ksp = { id = 'com.google.devtools.ksp', version.ref = 'ksp' }

diff --git a/resources/icons/build.gradle.kts b/resources/icons/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
   alias(libs.plugins.kotlin.multiplatform)
   alias(libs.plugins.android.library)
   alias(libs.plugins.compose)
-  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.ksp)
 }
 

diff --git a/resources/strings/build.gradle.kts b/resources/strings/build.gradle.kts
@@ -16,7 +16,6 @@
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
   alias(libs.plugins.compose)
-  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.ksp)
 }
 

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -23,7 +23,6 @@ plugins {
   alias(libs.plugins.kotlin.cocoapods)
   alias(libs.plugins.android.library)
   alias(libs.plugins.compose)
-  alias(libs.plugins.compose.compiler)
   alias(libs.plugins.sqldelight)
   alias(libs.plugins.ksp)
   alias(libs.plugins.kotlin.parcelize)