diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 25e97a13..61d62bef 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -39,6 +39,7 @@ android { } dependencies { + implementation(platform(libs.androidx.compose.bom)) annotationProcessor(libs.androidx.hilt.compiler) annotationProcessor(libs.dagger.hilt.compiler) implementation(projects.api) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 7711502b..95550c2b 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -9,6 +9,7 @@ plugins { androidComponents { beforeVariants { it.enableUnitTest = false } } dependencies { + implementation(platform(libs.androidx.compose.bom)) api(libs.napier) implementation(projects.database) implementation(projects.model) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2b1e1814..59d1fb4f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ accompanist = "0.26.5-rc" agp = "8.0.0-alpha06" coil = "2.2.2" +# @keep used for kotlinCompilerExtensionVersion composeCompiler = "1.3.2" -composeUi = "1.4.0-alpha01" coroutines = "1.6.4" dagger = "2.44" hilt = "1.0.0" @@ -24,16 +24,16 @@ accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-sys androidx-activity-compose = "androidx.activity:activity-compose:1.7.0-alpha02" androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha06" androidx-browser = "androidx.browser:browser:1.5.0-alpha01" -androidx-compose-animation = "androidx.compose.animation:animation:1.4.0-alpha01" -androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" } -androidx-compose-foundation = "androidx.compose.foundation:foundation:1.4.0-alpha01" -androidx-compose-material = "androidx.compose.material:material:1.4.0-alpha01" -androidx-compose-material3 = "androidx.compose.material3:material3:1.1.0-alpha01" -androidx-compose-runtime = "androidx.compose.runtime:runtime:1.4.0-alpha01" -androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "composeUi" } -androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text", version.ref = "composeUi" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeUi" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "composeUi" } +androidx-compose-animation = { module = "androidx.compose.animation:animation" } +androidx-compose-bom = "androidx.compose:compose-bom:2022.10.00" +androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } +androidx-compose-material = { module = "androidx.compose.material:material" } +androidx-compose-material3 = { module = "androidx.compose.material3:material3" } +androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } +androidx-compose-ui = { module = "androidx.compose.ui:ui" } +androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" } +androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-core-splashscreen = "androidx.core:core-splashscreen:1.0.0" androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt" } androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt" } diff --git a/settings.gradle.kts b/settings.gradle.kts index a932210c..cde8fc48 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -56,6 +56,7 @@ dependencyResolutionManagement { includeGroup("androidx.benchmark") includeGroup("androidx.browser") includeGroup("androidx.collection") + includeGroup("androidx.compose") includeGroup("androidx.compose.animation") includeGroup("androidx.compose.compiler") includeGroup("androidx.compose.foundation")