diff --git a/android/build.gradle.kts b/android/build.gradle.kts index c570cda7..bd23d866 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -68,6 +68,7 @@ whetstone { } dependencies { + implementation(platform(libs.androidx.compose.bom)) implementation(platform(libs.okhttp.bom)) implementation(libs.aboutLibraries.m3) implementation(libs.androidx.activity.compose) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 2ab7bc28..883a58e3 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { api(projects.database.core) api(projects.model) + implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.browser) implementation(libs.androidx.compose.animation) implementation(libs.androidx.compose.foundation) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa7b7356..8c207a14 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,10 +3,8 @@ aboutLibraries = "11.1.3" agp = "8.5.0-alpha05" benchmark = "1.3.0-alpha03" coil = "2.6.0" -compose = "1.7.0-alpha07" # @keep used for kotlinCompilerExtensionVersion composeCompiler = "1.5.12" -composeMaterial = "1.3.0-alpha05" coroutines = "1.8.1-Beta" dagger = "2.51.1" glance = "1.0.0" @@ -28,19 +26,20 @@ aboutLibraries-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version androidx-activity-compose = "androidx.activity:activity-compose:1.9.0" androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" } androidx-browser = "androidx.browser:browser:1.8.0" -androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" } -androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" } +androidx-compose-animation = { module = "androidx.compose.animation:animation" } +androidx-compose-bom = "dev.chrisbanes.compose:compose-bom:2024.04.00-alpha01" +androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-glance = { module = "androidx.glance:glance-appwidget", version.ref = "glance" } androidx-compose-glance-m3 = { module = "androidx.glance:glance-material3", version.ref = "glance" } -androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" } -androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "composeMaterial" } -androidx-compose-material3-window-size = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "composeMaterial" } -androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" } -androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } -androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text", version.ref = "compose" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } -androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" } +androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } +androidx-compose-material3 = { module = "androidx.compose.material3:material3" } +androidx-compose-material3-window-size = { module = "androidx.compose.material3:material3-window-size-class" } +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-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-core-splashscreen = "androidx.core:core-splashscreen:1.2.0-alpha01" androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" } androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 64347336..afdfec22 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -22,6 +22,7 @@ android { dependencies { implementation(projects.core) + implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.ui.util) implementation(libs.androidx.lifecycle.runtime)