From 9c1cd210557601f8b1a4f7bcf85c730d3e25e150 Mon Sep 17 00:00:00 2001 From: JoelKanyi Date: Fri, 24 May 2024 05:58:23 +0300 Subject: [PATCH] update to kotlin 2.0.0 --- app/build.gradle.kts | 9 ++++++--- build.gradle.kts | 1 + gradle/libs.versions.toml | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6692c26..b457e15 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,6 +21,7 @@ plugins { alias(libs.plugins.hilt.android) alias(libs.plugins.parcelize) alias(libs.plugins.ksp) + alias(libs.plugins.compose.compiler) } android { @@ -76,9 +77,7 @@ android { compose = true buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() - } + sourceSets { getByName("androidTest").assets.srcDirs(files("$rootDir/app/schemas")) // Room } @@ -90,6 +89,10 @@ android { } } +composeCompiler { + enableStrongSkippingMode = true +} + dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.ui) diff --git a/build.gradle.kts b/build.gradle.kts index 505355c..f611d20 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,6 +9,7 @@ plugins { alias(libs.plugins.kapt) apply false alias(libs.plugins.parcelize) apply false alias(libs.plugins.ksp) apply false + alias(libs.plugins.compose.compiler) apply false } subprojects { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b8c0f02..b7c08b6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,9 @@ [versions] -kotlin = "1.9.24" -ksp = "1.9.24-1.0.20" +kotlin = "2.0.0" +ksp = "2.0.0-1.0.21" gradle = "8.2.2" compose = "1.6.7" material3 = "1.3.0-beta01" -compose-compiler = "1.5.14" hiltAndroid = "2.51.1" hiltCompiler = "1.2.0" kotlinxCoroutinesAndroid = "1.8.1" @@ -88,3 +87,4 @@ spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }