diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ee91861a0..7b8f71184f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -120,7 +120,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.0" + kotlinCompilerExtensionVersion = libs.versions.composecompiler.get() } packagingOptions { resources { @@ -167,7 +167,7 @@ dependencies { anvil(projects.anvilcodegen) // https://developer.android.com/studio/write/java8-support#library-desugaring-versions - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2") implementation(libs.appyx.core) implementation(libs.androidx.splash) implementation(libs.androidx.corektx) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 001825734c..0a0991aca5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,10 +3,10 @@ [versions] # Project -android_gradle_plugin = "7.3.1" -firebase_gradle_plugin = "3.0.2" -kotlin = "1.8.0" -ksp = "1.8.0-1.0.8" +android_gradle_plugin = "7.4.1" +firebase_gradle_plugin = "3.2.0" +kotlin = "1.8.10" +ksp = "1.8.10-1.0.9" molecule = "0.7.0" # AndroidX @@ -21,6 +21,7 @@ startup = "1.1.1" # Compose compose_bom = "2023.01.00" +composecompiler = "1.4.2" # Coroutines coroutines = "1.6.4" diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt index 5fdb80ba1a..f5724b2e72 100644 --- a/plugins/src/main/kotlin/extension/CommonExtension.kt +++ b/plugins/src/main/kotlin/extension/CommonExtension.kt @@ -50,7 +50,7 @@ fun CommonExtension<*, *, *, *>.composeConfig() { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.0" + kotlinCompilerExtensionVersion = "1.4.2" // libs.versions.composecompiler.get() } packagingOptions { diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt index 731a00042f..de65b65796 100644 --- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt +++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt @@ -16,9 +16,9 @@ package extension -import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.androidTestImplementation -import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.debugImplementation -import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.implementation +import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.androidTestImplementation +import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.debugImplementation +import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.implementation import org.gradle.kotlin.dsl.DependencyHandlerScope import org.gradle.kotlin.dsl.project @@ -33,6 +33,7 @@ fun DependencyHandlerScope.commonDependencies() { * Dependencies used by all the modules with composable items */ fun DependencyHandlerScope.composeDependencies() { + // TODO Find a way to use androidx_compose_bom val composeBom = platform("androidx.compose:compose-bom:2023.01.00") implementation(composeBom) androidTestImplementation(composeBom)