From 03aada6028c3a92f561bb4af971cc21b72c4f822 Mon Sep 17 00:00:00 2001 From: Gibran Chevalley Date: Wed, 4 Dec 2024 16:06:31 +0100 Subject: [PATCH] refactor: Introduce compose BOM to handle compose dependencies versions --- Core2/Onboarding/build.gradle.kts | 11 ++++++----- Core2/gradle/core2.versions.toml | 17 +++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Core2/Onboarding/build.gradle.kts b/Core2/Onboarding/build.gradle.kts index 29205fd7b..18b3af0e2 100644 --- a/Core2/Onboarding/build.gradle.kts +++ b/Core2/Onboarding/build.gradle.kts @@ -41,11 +41,12 @@ android { } dependencies { + implementation(platform(core2.compose.bom)) implementation(core2.androidx.core.ktx) - implementation(core2.androidx.material3.android) - implementation(core2.androidx.runtime.android) - implementation(core2.androidx.foundation.android) - implementation(core2.androidx.ui.tooling.preview.android) + implementation(core2.compose.foundation) + implementation(core2.compose.material3) + implementation(core2.compose.runtime) + implementation(core2.compose.ui.tooling.preview) - debugImplementation(core2.androidx.ui.tooling) + debugImplementation(core2.compose.ui.tooling) } diff --git a/Core2/gradle/core2.versions.toml b/Core2/gradle/core2.versions.toml index 877fa979b..91053ecd5 100644 --- a/Core2/gradle/core2.versions.toml +++ b/Core2/gradle/core2.versions.toml @@ -1,19 +1,16 @@ [versions] coreKtx = "1.15.0" -foundationAndroid = "1.7.3" -runtimeAndroid = "1.7.5" -material3Android = "1.3.1" -uiTooling = "1.7.5" -uiToolingPreviewAndroid = "1.7.5" +composeBom = "2024.11.00" matomo = "4.1.4" sentry-android = "7.15.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -androidx-foundation-android = { group = "androidx.compose.foundation", name = "foundation-android", version.ref = "foundationAndroid" } -androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" } -androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" } -androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" } +compose-foundation = { group = "androidx.compose.foundation", name = "foundation-android" } +compose-material3 = { group = "androidx.compose.material3", name = "material3-android" } +compose-runtime = { group = "androidx.compose.runtime", name = "runtime-android" } +compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview-android" } +compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } matomo = { module = "com.github.matomo-org:matomo-sdk-android", version.ref = "matomo" } sentry-android = { module = "io.sentry:sentry-android", version.ref = "sentry-android" }