diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 7d4ac612..5d1861e0 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -43,7 +43,6 @@ 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 b405d235..814cde26 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -18,7 +18,6 @@ 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 2962e99b..b39d3835 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,16 +24,15 @@ 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-alpha08" androidx-browser = "androidx.browser:browser:1.5.0-alpha02" -androidx-compose-animation = { module = "androidx.compose.animation:animation" } -androidx-compose-bom = "androidx.compose:compose-bom:2022.12.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-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 = "androidx.compose.ui:ui:1.4.0-alpha04" +androidx-compose-ui-text = "androidx.compose.ui:ui-text:1.4.0-alpha04" +androidx-compose-ui-tooling = "androidx.compose.ui:ui-tooling:1.4.0-alpha04" +androidx-compose-ui-tooling-preview = "androidx.compose.ui:ui-tooling-preview:1.4.0-alpha04" androidx-core-splashscreen = "androidx.core:core-splashscreen:1.0.0" androidx-lifecycle-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha03" androidx-navigation-compose = "androidx.navigation:navigation-compose:2.6.0-alpha04" diff --git a/settings.gradle.kts b/settings.gradle.kts index 895b3f1f..a19aeefe 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -74,6 +74,7 @@ dependencyResolutionManagement { includeGroup("androidx.customview") includeGroup("androidx.databinding") includeGroup("androidx.drawerlayout") + includeGroup("androidx.emoji2") includeGroup("androidx.exifinterface") includeGroup("androidx.fragment") includeGroup("androidx.interpolator")