Harden tests and fix 2-compose

Author: vaslabs

example/androidlib/kotlin/2-compose/app/releaseKey.jks

@@ -27,16 +27,40 @@ object app extends AndroidAppKotlinModule {
   def androidCompileSdk = 35
   def androidMinSdk = 26
   def androidEnableCompose = true
+
+  def androidReleaseKeyName: Option[String] = Some("releaseKey.jks")
+  def androidReleaseKeyAlias: T[Option[String]] = Task { Some("releaseKey") }
+  def androidReleaseKeyPass: T[Option[String]] = Task { Some("MillBuildTool") }
+  def androidReleaseKeyStorePass: T[Option[String]] = Task { Some("MillBuildTool") }
   def androidIsDebug = true
 
   def androidApplicationId = "com.example.composetest"
   def androidApplicationNamespace = "com.example.composetest"
 
   def mvnDeps: T[Seq[Dep]] = Seq(
     mvn"androidx.core:core-ktx:1.15.0",
-    mvn"androidx.activity:activity-compose:1.9.3",
-    mvn"androidx.compose.ui:ui:1.7.5",
-    mvn"androidx.compose.material3:material3:1.3.1"
+    mvn"androidx.appcompat:appcompat:1.7.0",
+    mvn"androidx.annotation:annotation:1.9.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.ui:ui-tooling-preview:1.7.6",
+    mvn"androidx.compose.ui:ui:1.7.6",
+    mvn"androidx.compose.ui:ui-unit:1.7.6",
+    mvn"androidx.compose.ui:ui-text:1.7.6",
+    mvn"androidx.emoji2:emoji2:1.3.0",
+    mvn"androidx.compose.ui:ui-graphics:1.7.6",
+    mvn"androidx.lifecycle:lifecycle-common:2.8.7",
+    mvn"androidx.lifecycle:lifecycle-process:2.8.7",
+    mvn"androidx.lifecycle:lifecycle-runtime-compose:2.8.7",
+    mvn"androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7",
+    mvn"androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7",
+    mvn"androidx.customview:customview-poolingcontainer:1.0.0",
+    mvn"androidx.tracing:tracing:1.2.0"
   )
 
 }
@@ -48,6 +72,30 @@ object app extends AndroidAppKotlinModule {
 > ./mill show app.androidApk
 ".../out/app/androidApk.dest/app.apk"
 
+
+> ./mill show app.createAndroidVirtualDevice
+...Name: test, DeviceId: medium_phone...
+
+> ./mill show app.startAndroidEmulator
+
+> ./mill show app.androidInstall
+...All files should be loaded. Notifying the device...
+
+> ./mill show app.androidRun --activity com.example.composetest.MainActivity
+[
+  "Starting: Intent { cmp=com.example.composetest/.MainActivity }",
+  "Status: ok",
+  "LaunchState: COLD",
+  "Activity: com.example.composetest/.MainActivity",
+  "TotalTime: ...",
+  "WaitTime: ...",
+  "Complete"
+]
+
+> ./mill show app.stopAndroidEmulator
+
+> ./mill show app.deleteAndroidVirtualDevice
+
 */
 
 // This command triggers the build process, which installs the necessary build components, compiles the Kotlin

example/androidlib/kotlin/2-compose/build.mill

@@ -64,7 +64,6 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
     mvn"com.google.dagger:hilt-android:2.56",
     mvn"androidx.hilt:hilt-navigation-compose:1.2.0",
     mvn"com.google.accompanist:accompanist-swiperefresh:0.36.0",
-    mvn"androidx.compose:compose-bom:2024.12.01",
     mvn"androidx.customview:customview-poolingcontainer:1.0.0",
     mvn"androidx.tracing:tracing:1.2.0"
   )

example/thirdparty/androidtodo/build.mill

@@ -830,14 +830,6 @@ trait AndroidAppModule extends AndroidModule { outer =>
     )
   }
 
-  /**
-   * Provides the output path for the generated main-dex list file, which is used
-   * during the DEX generation process.
-   */
-  def mainDexListOutput: T[Option[PathRef]] = Task {
-    Some(androidModuleGeneratedDexVariants().mainDexListOutput)
-  }
-
   /** ProGuard/R8 rules configuration files for release target (user-provided and generated) */
   def androidProguardReleaseConfigs: T[Seq[PathRef]] = Task {
     val proguardFilesFromReleaseSettings = androidReleaseSettings().proguardFiles
@@ -1032,14 +1024,6 @@ trait AndroidAppModule extends AndroidModule { outer =>
       "--dex"
     )
 
-    // Multi-dex arguments (if any are provided)
-    val multiDexArgs =
-      mainDexRules().toSeq.flatMap(r => Seq("--main-dex-rules", r.path.toString)) ++
-        mainDexList().toSeq.flatMap(l => Seq("--main-dex-list", l.path.toString)) ++
-        mainDexListOutput().toSeq.flatMap(l => Seq("--main-dex-list-output", l.path.toString))
-
-    r8ArgsBuilder ++= multiDexArgs
-
     // Baseline profile rewriting arguments, if a baseline profile is provided.
     val baselineArgs = baselineProfile().map { bp =>
       Seq("--art-profile", bp.path.toString, baselineOutOpt.toString)
@@ -1221,7 +1205,7 @@ trait AndroidAppModule extends AndroidModule { outer =>
     }
 
     override def androidPackagedDeps: T[Seq[PathRef]] = Task {
-      resolvedRunMvnDeps()
+      androidResolvedRunMvnDeps()
     }
 
     /**

libs/androidlib/src/mill/androidlib/AndroidAppModule.scala

@@ -529,22 +529,6 @@ trait AndroidModule extends JavaModule {
     androidSdkModule().androidLibsClasspaths()
   }
 
-  /**
-   * Specifies the path to the main-dex rules file, which contains ProGuard rules
-   * for determining which classes should be included in the primary DEX file.
-   */
-  def mainDexRules: T[Option[PathRef]] = Task {
-    Some(PathRef(androidCompiledResources()._1.path / "main-dex-rules.pro"))
-  }
-
-  /**
-   * Returns the path to the main-dex list file, which explicitly lists the classes
-   * to be included in the primary DEX file. Currently, this is not defined.
-   */
-  def mainDexList: T[Option[PathRef]] = Task {
-    None
-  }
-
   /** Optional baseline profile for ART rewriting */
   def baselineProfile: T[Option[PathRef]] = Task {
     None