From 7096e62948fa6e5bf6c7a8e9965ecf786804e1f8 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 12 Jan 2023 22:32:45 +0530 Subject: [PATCH] fix(deps): switch to Chris Banes' Compose alpha BOM --- android/build.gradle.kts | 1 + common/build.gradle.kts | 1 + gradle/libs.versions.toml | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 5d1861e0..7d4ac612 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -43,6 +43,7 @@ android { dependencies { kapt(libs.dagger.compiler) + implementation(platform(libs.androidx.compose.bom)) implementation(libs.dagger) implementation(projects.api) implementation(projects.common) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index b8a006ef..589ddf0d 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -18,6 +18,7 @@ anvil { generateDaggerFactories.set(true) } androidComponents { beforeVariants { it.enableUnitTest = false } } dependencies { + implementation(platform(libs.androidx.compose.bom)) api(libs.napier) implementation(projects.core) implementation(projects.database) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 027b2ea9..ab431dff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,15 +24,16 @@ accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-sys androidx-activity-compose = "androidx.activity:activity-compose:1.7.0-alpha03" androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha09" androidx-browser = "androidx.browser:browser:1.5.0-beta01" -androidx-compose-animation = "androidx.compose.animation:animation:1.4.0-alpha04" -androidx-compose-foundation = "androidx.compose.foundation:foundation:1.4.0-alpha04" -androidx-compose-material = "androidx.compose.material:material:1.4.0-alpha04" -androidx-compose-material3 = "androidx.compose.material3:material3:1.1.0-alpha04" -androidx-compose-runtime = "androidx.compose.runtime:runtime:1.4.0-alpha04" -androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" } -androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text", version.ref = "androidx-compose-ui" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose-ui" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui" } +androidx-compose-animation = { module = "androidx.compose.animation:animation" } +androidx-compose-bom = "dev.chrisbanes.compose:compose-bom:2023.02.00-alpha01" +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-lifecycle-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha04" androidx-navigation-compose = "androidx.navigation:navigation-compose:2.6.0-alpha04"