refactor: Introduce compose BOM to handle compose dependencies versions

Infomaniak · Dec 4, 2024 · 03aada6 · 03aada6
1 parent 53e85f9
commit 03aada6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git 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
@@ -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" }