diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index fe63bb677d..6d0ee1c2a9 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 17683a8e20..9fe9b9b1d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,6 +11,7 @@ plugins { kotlin("kapt") id("org.jetbrains.kotlin.android") kotlin("plugin.serialization") + alias(libs.plugins.kotlin.compose) } apply(plugin = "dagger.hilt.android.plugin") @@ -161,10 +162,6 @@ android { } } - buildFeatures { - compose = true - } - lint { disable.addAll(listOf("MissingTranslation", "ExtraTranslation", "MissingQuantity")) } @@ -179,9 +176,6 @@ android { kotlinOptions { freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn" } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get() - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index 688d0e1f5d..aff36e0d60 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,7 @@ buildscript { plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.hilt) apply false + alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.gradlePlugin) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.kotlin.ksp) apply false diff --git a/color/build.gradle.kts b/color/build.gradle.kts index 2482a3d6fb..d4595f7ade 100644 --- a/color/build.gradle.kts +++ b/color/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("com.android.library") id("org.jetbrains.kotlin.android") + alias(libs.plugins.kotlin.compose) } java { @@ -16,16 +17,10 @@ android { minSdk = 21 } namespace = "com.junkfood.seal.color" - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get() - } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8 } - buildFeatures { - compose = true - } buildTypes { all { proguardFiles( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 56bc7d3cf2..670b713e68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,6 @@ accompanist = "0.34.0" androidGradlePlugin = "8.5.1" androidxComposeBom = "2024.04.00-alpha01" -androidxComposeCompiler = "1.5.11" androidxCore = "1.12.0" androidMaterial = "1.11.0" androidxAppCompat = "1.7.0-alpha03" @@ -27,14 +26,13 @@ hilt = "2.45" hiltExt = "1.0.0" junit4 = "4.13.2" -kotlin = "1.9.23" +kotlin = "2.0.0" kotlinxCoroutines = "1.7.1" kotlinxDatetime = "0.4.0" kotlinxSerializationJson = "1.6.2" okhttp = "5.0.0-alpha.10" room = "2.6.0" -ksp = "1.9.23-1.0.19" youtubedlAndroid = "23b26d55f8" @@ -124,9 +122,10 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-gradlePlugin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +kotlin-ksp = "com.google.devtools.ksp:2.0.0-1.0.24" [bundles] accompanist = [