From 564e262f86a5db76259f16fc34652380a929d71d Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Thu, 2 May 2024 21:21:27 -0700 Subject: [PATCH] Bump Kotlin to 2.0.0-RC2 and use Compiler plugin --- app/build.gradle.kts | 4 +--- build.gradle.kts | 1 + gradle/libs.versions.toml | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c8012dd..370e3c1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.kotlinAndroid) + alias(libs.plugins.kotlinCompose) } android { @@ -39,9 +40,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index 82d367b..8def78f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,5 +4,6 @@ plugins { alias(libs.plugins.androidApplication) apply false alias(libs.plugins.androidLibrary) apply false alias(libs.plugins.kotlinAndroid) apply false + alias(libs.plugins.kotlinCompose) apply false alias(libs.plugins.kotlinJvm) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 87bd409..2e4c8f4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,9 +5,8 @@ android-minSdk = "26" android-targetSdk = "34" activityCompose = "1.9.0" composeBom = "2024.05.00" -composeCompiler = "1.5.12" coroutines = "1.8.0" -kotlin = "1.9.23" +kotlin = "2.0.0-RC2" ktor = "2.3.9" multiplatform-settings = "1.1.1" voyager = "1.0.0" @@ -34,4 +33,5 @@ voyager-screenmodel = { group = "cafe.adriel.voyager", name = "voyager-screenmod androidApplication = { id = "com.android.application", version.ref = "agp" } androidLibrary = { id = "com.android.library", version.ref = "agp" } kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }