diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5215246f3..29a7f377c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -24,6 +24,7 @@ import java.util.Properties plugins { alias(libs.plugins.android.application) alias(libs.plugins.jetbrains.kotlin.android) + alias(libs.plugins.jetbrains.kotlin.compose) alias(libs.plugins.jetbrains.kotlin.parcelize) alias(libs.plugins.google.ksp) alias(libs.plugins.androidx.navigation) @@ -104,9 +105,6 @@ android { aidl = true compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.13" - } kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() } diff --git a/build.gradle.kts b/build.gradle.kts index c6223d531..72296555a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false + alias(libs.plugins.jetbrains.kotlin.compose) apply false alias(libs.plugins.jetbrains.kotlin.parcelize) apply false alias(libs.plugins.google.ksp) apply false alias(libs.plugins.androidx.navigation) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94b688424..34d54b470 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] activityCompose = "1.9.0" -androidGradlePlugin = "8.4.0" +androidGradlePlugin = "8.4.1" browserVersion = "1.8.0" coilVersion = "2.6.0" composeBom = "2024.05.00" @@ -16,12 +16,12 @@ hiltVersion = "2.51.1" hiltWorkVersion = "1.2.0" junit = "4.13.2" junitVersion = "1.1.5" -kotlinVersion = "1.9.23" -kspVersion = "1.9.23-1.0.20" +kotlinVersion = "2.0.0" +kspVersion = "2.0.0-1.0.21" ktlintVersion = "12.1.0" leakcanaryAndroidVersion = "2.14" -lifeVersion = "2.7.0" -materialVersion = "1.11.0" +lifeVersion = "2.8.0" +materialVersion = "1.12.0" navVersion = "2.7.7" okhttpVersion = "4.12.0" preferenceVersion = "1.2.1" @@ -32,7 +32,7 @@ roomVersion = "2.6.1" shimmerVersion = "0.5.0" shizukuVersion = "13.1.5" swiperefreshlayoutVersion = "1.1.0" -viewpager2Version = "1.0.0" +viewpager2Version = "1.1.0" workVersion = "2.9.0" [libraries] @@ -91,5 +91,6 @@ google-ksp = { id = "com.google.devtools.ksp", version.ref = "kspVersion" } hilt-android-plugin = { id = "com.google.dagger.hilt.android", version.ref = "hiltVersion" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintVersion" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" } +jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" } jetbrains-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlinVersion" } rikka-tools-refine-plugin = { id = "dev.rikka.tools.refine", version.ref = "rikkaToolsVersion" }