diff --git a/.gitignore b/.gitignore index 1649a9877..cec5a8e70 100644 --- 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 index 6210724e3..e7601fdc1 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -18,13 +18,10 @@ 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) } -composeCompiler { enableStrongSkippingMode = true } - kotlin { jvmToolchain(20) diff --git a/build.gradle.kts b/build.gradle.kts index b5303d35c..9f83520cb 100644 --- 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 index f849e5719..7ff5776c6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "2.0.0" +kotlin = "1.9.23" android_gradle_plugin = "8.4.1" -compose = "1.6.10" +compose = "1.6.2" android_sdk_compile = "34" android_sdk_target = "34" @@ -29,7 +29,7 @@ coil = "3.0.0-alpha04" spotless = "6.25.0" ktfmt = "0.44" kotlininject = "0.6.3" -ksp = "2.0.0-1.0.21" +ksp = "1.9.23-1.0.20" material_color_utilities = "1.0.0-alpha01" ksoup = "0.1.2" sqliteAndroid = "3.45.0" @@ -128,7 +128,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 index 185ecdd08..17314627d 100644 --- 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 index 6a9c1b824..6dece5461 100644 --- 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 index b366a5054..38d78709a 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -23,15 +23,12 @@ 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) alias(libs.plugins.kotlin.serialization) } -composeCompiler { enableStrongSkippingMode = true } - @OptIn(ExperimentalKotlinGradlePluginApi::class) kotlin { jvmToolchain(20)