diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index a10d4647..f8463ae1 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -1,5 +1,6 @@ import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -24,6 +25,8 @@ kotlin { tasks.withType().configureEach { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) + apiVersion.set(KotlinVersion.KOTLIN_2_0) + languageVersion.set(KotlinVersion.KOTLIN_2_0) } } diff --git a/gradle.properties b/gradle.properties index 2151e067..32512707 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,6 +31,9 @@ android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false android.library.defaults.buildfeatures.androidresources=false +# Run Lint on K2 +android.lint.useK2Uast=true + # do not import irrelevant source sets import_orphan_source_sets=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6cb31387..16d99949 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -kotlin = "1.9.10" -ksp = "1.9.10-1.0.13" -androidGradlePlugin = "8.3.0-alpha01" +kotlin = "1.9.20-Beta" +ksp = "1.9.20-Beta-1.0.13" +androidGradlePlugin = "8.3.0-alpha04" gradle-toolchainsResolverPlugin = "0.5.0" appVersioning = "1.3.1" apollo = "3.8.2" -googleServices = "4.3.15" +googleServices = "4.4.0" wire = "4.8.1" detekt = "1.23.1" playPublisher = "3.8.4" @@ -21,21 +21,21 @@ firebase-appDistributionPlugin = "4.0.0" firebase-remoteConfig = "21.4.1" firebase-perf = "20.4.1" firebase-perfPlugin = "1.4.2" -firebase-crashlytics = "18.4.1" +firebase-crashlytics = "18.4.3" firebase-crashlyticsPlugin = "2.9.9" -androidx-compose-compiler = "1.5.3-dev-k1.9.10-593b4c95fce" -androidx-compose-ui = "1.6.0-alpha04" -androidx-compose-foundation = "1.6.0-alpha04" -androidx-compose-material3 = "1.2.0-alpha06" -androidx-core = "1.12.0-rc01" +androidx-compose-compiler = "1.5.4-dev-k1.9.20-Beta-692cbee7ddd" +androidx-compose-ui = "1.6.0-alpha05" +androidx-compose-foundation = "1.6.0-alpha05" +androidx-compose-material3 = "1.2.0-alpha07" +androidx-core = "1.12.0" androidx-coreSplashscreen = "1.0.1" -androidx-activity = "1.8.0-alpha07" -androidx-lifecycle = "2.7.0-alpha01" -androidx-navigation = "2.7.1" -androidx-dataStore = "1.1.0-alpha04" +androidx-activity = "1.8.0-beta01" +androidx-lifecycle = "2.7.0-alpha02" +androidx-navigation = "2.7.2" +androidx-dataStore = "1.1.0-alpha05" androidx-hiltNavigationCompose = "1.1.0-alpha01" androidx-profileinstaller = "1.3.1" -androidx-benchmark = "1.2.0-beta04" +androidx-benchmark = "1.2.0-beta05" androidx-metrics = "1.0.0-alpha04" androidx-test-core = "1.5.0" androidx-test-monitor = "1.6.1"