From 75afb8ab0676cec379319608fa71528351c03b63 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Wed, 1 May 2024 14:56:19 -0700 Subject: [PATCH] Update dependencies and fix compilation errors --- build.gradle.kts | 1 + core/analytics/build.gradle.kts | 1 + core/designsystem/build.gradle.kts | 1 + core/ui/build.gradle.kts | 1 + gradle.properties | 5 +++++ gradle/libs.versions.toml | 24 +++++++++++++----------- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0fedb0580..95bb1bff6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,6 +50,7 @@ plugins { alias(libs.plugins.room) apply false alias(libs.plugins.module.graph) apply true // Plugin applied to allow module graph generation alias(libs.plugins.jetbrains.compose) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.kotlin.multiplatform) apply false alias(libs.plugins.sqldelight.gradle.plugin) apply false alias(libs.plugins.ktrofit) apply false diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts index 5ae18a2b7..9bd82d5dc 100644 --- a/core/analytics/build.gradle.kts +++ b/core/analytics/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.nowinandroid.kmp.library) alias(libs.plugins.nowinandroid.kotlin.inject) alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) } android { diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index d0be37871..7eca1dee2 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.nowinandroid.kmp.library) alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) alias(libs.plugins.nowinandroid.android.library.jacoco) alias(libs.plugins.roborazzi) } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 034bf97a2..ac724be79 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.nowinandroid.kmp.library) alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) alias(libs.plugins.nowinandroid.android.library.jacoco) } diff --git a/gradle.properties b/gradle.properties index d0f17b229..fb5b9e7e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,3 +48,8 @@ kotlin.native.ignoreDisabledTargets=true # Suppress: ERROR: Compose targets '[macos]' are experimental and may have bugs! org.jetbrains.compose.experimental.macos.enabled=true + +# https://youtrack.jetbrains.com/issue/KT-67806/KMP-import-fails-if-android-target-has-flavors +# Supporess androidDemoDebugResourcesCopyHierarchicalMultiplatformResources' has completed is not supported +# TODO: Needs to be removed once the issue is fixed +kotlin.mpp.enableResourcesPublication=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7c50646a7..c4b2b662d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,14 +3,14 @@ accompanist = "0.34.0" androidDesugarJdkLibs = "2.0.4" # AGP and tools should be updated together androidGradlePlugin = "8.3.2" -androidTools = "31.3.2" +androidTools = "31.4.0" androidxActivity = "1.9.0" androidxAppCompat = "1.6.1" androidxBrowser = "1.8.0" -androidxComposeBom = "2024.04.01" -androidxComposeCompiler = "1.5.12" -androidxComposeUiTest = "1.7.0-alpha06" -androidxComposeMaterial3Adaptive = "1.0.0-alpha11" +androidxComposeBom = "2024.05.00" +androidxComposeCompiler = "1.5.13" +androidxComposeUiTest = "1.7.0-alpha08" +androidxComposeMaterial3Adaptive = "1.0.0-alpha12" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.13.0" androidxCoreSplashscreen = "1.0.1" @@ -42,11 +42,11 @@ hilt = "2.51.1" hiltExt = "1.2.0" jacoco = "0.8.7" junit4 = "4.13.2" -kotlin = "1.9.23" +kotlin = "2.0.0-RC2" kotlinxCoroutines = "1.8.0" kotlinxDatetime = "0.5.0" kotlinxSerializationJson = "1.6.3" -ksp = "1.9.23-1.0.20" +ksp = "2.0.0-RC2-1.0.20" moduleGraph = "2.5.0" okhttp = "4.12.0" protobuf = "4.26.1" @@ -70,8 +70,8 @@ androidx-core-ktx = "1.12.0" androidx-espresso-core = "3.5.1" androidx-material = "1.11.0" androidx-test-junit = "1.1.5" -compose = "1.6.6" -compose-plugin = "1.6.2" +compose-ui-tooling = "1.6.7" +compose-plugin = "1.6.10-beta03" junit = "4.13.2" sqldelight = "2.0.2" kotlinInject = '0.6.3' @@ -174,8 +174,8 @@ androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-espresso-core" } androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" } -compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } +compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui-tooling" } +compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-ui-tooling" } sqldelight-android-driver = { group = "app.cash.sqldelight", name = "android-driver", version.ref = "sqldelight" } sqldelight-native-driver = { group = "app.cash.sqldelight", name = "native-driver", version.ref = "sqldelight" } sqldelight-sqlite-driver = { group = "app.cash.sqldelight", name = "sqlite-driver", version.ref = "sqldelight" } @@ -232,7 +232,9 @@ protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" } roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" } room = { id = "androidx.room", version.ref = "room" } secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" } +org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } sqldelight-gradle-plugin = { id = "app.cash.sqldelight", version.ref = "sqldelight" } ktrofit = { id = "de.jensklingenberg.ktorfit", version.ref = "ktrofit" }