Bump Kotlin to 2.0.0-RC2 and use Compiler plugin

This commit is contained in:
Severiano Jaramillo 2024-05-02 21:21:27 -07:00
parent 6136075870
commit 564e262f86
3 changed files with 4 additions and 5 deletions

View file

@ -1,6 +1,7 @@
plugins { plugins {
alias(libs.plugins.androidApplication) alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid) alias(libs.plugins.kotlinAndroid)
alias(libs.plugins.kotlinCompose)
} }
android { android {
@ -39,9 +40,6 @@ android {
buildFeatures { buildFeatures {
compose = true compose = true
} }
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
packaging { packaging {
resources { resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}" excludes += "/META-INF/{AL2.0,LGPL2.1}"

View file

@ -4,5 +4,6 @@ plugins {
alias(libs.plugins.androidApplication) apply false alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.kotlinAndroid) apply false alias(libs.plugins.kotlinAndroid) apply false
alias(libs.plugins.kotlinCompose) apply false
alias(libs.plugins.kotlinJvm) apply false alias(libs.plugins.kotlinJvm) apply false
} }

View file

@ -5,9 +5,8 @@ android-minSdk = "26"
android-targetSdk = "34" android-targetSdk = "34"
activityCompose = "1.9.0" activityCompose = "1.9.0"
composeBom = "2024.05.00" composeBom = "2024.05.00"
composeCompiler = "1.5.12"
coroutines = "1.8.0" coroutines = "1.8.0"
kotlin = "1.9.23" kotlin = "2.0.0-RC2"
ktor = "2.3.9" ktor = "2.3.9"
multiplatform-settings = "1.1.1" multiplatform-settings = "1.1.1"
voyager = "1.0.0" 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" } androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" } androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } 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" } kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }