Android: enable boms

Author: vaslabs

example/thirdparty/androidtodo/build.mill

@@ -56,6 +56,24 @@ object app extends AndroidAppKotlinModule with AndroidR8AppModule with AndroidBu
 
   def androidIsDebug = true
 
+  def bomMvnDeps = Seq(
+    mvn"androidx.compose:compose-bom:2024.12.01"
+  )
+
+  // versions are resolved with compose-bom
+  def composeDeps = Seq(
+    mvn"androidx.compose.foundation:foundation:_",
+    mvn"androidx.compose.foundation:foundation-layout:_",
+    mvn"androidx.compose.animation:animation:_",
+    mvn"androidx.compose.material3:material3:_",
+    mvn"androidx.compose.material:material:_",
+    mvn"androidx.compose.material:material-icons-extended:_",
+    mvn"androidx.compose.ui:ui-tooling-preview:_",
+    // debug
+    mvn"androidx.compose.ui:ui-tooling:_",
+    mvn"androidx.compose.ui:ui-test-manifest:_"
+  )
+
   def mvnDeps: T[Seq[Dep]] = Seq(
     mvn"androidx.core:core-ktx:1.15.0",
     mvn"androidx.appcompat:appcompat:1.7.0",
@@ -65,17 +83,7 @@ object app extends AndroidAppKotlinModule with AndroidR8AppModule with AndroidBu
     mvn"androidx.test.espresso:espresso-idling-resource:3.6.1",
     mvn"androidx.room:room-runtime:2.6.1",
     mvn"androidx.room:room-ktx:2.6.1",
-    mvn"androidx.compose:compose-bom:2024.12.01",
     mvn"androidx.activity:activity-compose:1.10.0",
-    mvn"androidx.compose.foundation:foundation:1.7.6",
-    mvn"androidx.compose.animation:animation-core:1.7.6",
-    mvn"androidx.compose.foundation:foundation-layout:1.7.6",
-    mvn"androidx.compose.animation:animation:1.7.6",
-    mvn"androidx.compose.material3:material3:1.3.1",
-    mvn"androidx.compose.material:material:1.7.6",
-    mvn"androidx.compose.material:material-icons-core:1.7.6",
-    mvn"androidx.compose.material:material-icons-extended:1.7.6",
-    mvn"androidx.compose.ui:ui-tooling-preview:1.7.6",
     mvn"androidx.navigation:navigation-compose:2.8.5",
     mvn"androidx.compose.ui:ui:1.7.6",
     mvn"androidx.compose.ui:ui-unit:1.7.6",
@@ -92,11 +100,8 @@ object app extends AndroidAppKotlinModule with AndroidR8AppModule with AndroidBu
     mvn"androidx.hilt:hilt-navigation-compose:1.2.0",
     mvn"com.google.accompanist:accompanist-swiperefresh:0.36.0",
     mvn"androidx.customview:customview-poolingcontainer:1.0.0",
-    mvn"androidx.tracing:tracing:1.2.0",
-    // debug
-    mvn"androidx.compose.ui:ui-tooling:1.7.6",
-    mvn"androidx.compose.ui:ui-test-manifest:1.7.6"
-  )
+    mvn"androidx.tracing:tracing:1.2.0"
+  ) ++ composeDeps
 
   def kotlinSymbolProcessors: T[Seq[Dep]] = Seq(
     mvn"androidx.room:room-compiler:2.6.1",
@@ -116,6 +121,10 @@ object app extends AndroidAppKotlinModule with AndroidR8AppModule with AndroidBu
       mvn"com.google.dagger:hilt-android-compiler:2.56"
     )
 
+    def bomMvnDeps = Seq(
+      mvn"androidx.compose:compose-bom:2024.12.01"
+    )
+
     def mvnDeps = super.mvnDeps() ++ Seq(
       mvn"junit:junit:4.13.2",
       mvn"androidx.arch.core:core-testing:2.2.0",
@@ -126,7 +135,6 @@ object app extends AndroidAppKotlinModule with AndroidR8AppModule with AndroidBu
       mvn"androidx.test.espresso:espresso-contrib:3.6.1",
       mvn"androidx.test.espresso:espresso-intents:3.6.1",
       mvn"com.google.truth:truth:1.4.4",
-      mvn"androidx.compose:compose-bom:2024.12.01",
       mvn"androidx.compose.ui:ui-test-junit4:1.7.6",
       mvn"com.google.dagger:hilt-android-testing:2.56"
     )
@@ -178,10 +186,7 @@ object app extends AndroidAppKotlinModule with AndroidR8AppModule with AndroidBu
       mvn"androidx.test.espresso:espresso-idling-resource:3.6.1",
       mvn"androidx.test.espresso.idling:idling-concurrent:3.6.1",
       // AndroidX Test - Hilt testing
-      mvn"com.google.dagger:hilt-android-testing:2.56",
-      // debug
-      mvn"androidx.compose.ui:ui-tooling:1.7.6",
-      mvn"androidx.compose.ui:ui-test-manifest:1.7.6"
+      mvn"com.google.dagger:hilt-android-testing:2.56"
     )
 
     def kotlinSymbolProcessors: T[Seq[Dep]] = Seq(

libs/androidlib/src/mill/androidlib/AndroidModule.scala

@@ -158,7 +158,7 @@ trait AndroidModule extends JavaModule {
           VariantMatcher.Equals("androidJvm"),
           VariantMatcher.Equals("jvm")
         ))
-    )
+    ).withForceDepMgmtVersions(Some(true))
   }
 
   /**