Merge pull request #6 from vaslabs-ltd/jetchat-android-fix-test-apk-issues

Fixed with com-lihaoyi/mill#6073

Author: vaslabs

JetNews/package.mill

@@ -82,8 +82,7 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
   }
 
 
-  object androidTest extends AndroidAppKotlinInstrumentedTests
-  , AndroidR8AppModule {
+  object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8InstrumentedTestsModule {
 
     def bomMvnDeps = super.mvnDeps() ++ Seq(
       mvn"androidx.compose:compose-bom:2025.05.00"

Jetchat/package.mill

@@ -4,6 +4,8 @@ import mill.*
 import androidlib.*
 import kotlinlib.*
 import build.*
+import mill.api.Task.Simple as T
+import mill.api.{PathRef, Task}
 import mill.javalib.api.JvmWorkerApi
 import mill.kotlinlib.ksp.KspModule
 
@@ -41,7 +43,17 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
     true
   }
 
-  override def mvnDeps = super.mvnDeps() ++ Seq(
+  private def debugMvnDeps: T[Seq[Dep]] = Task {
+    if (androidIsDebug())
+      Seq(
+        mvn"androidx.compose.ui:ui-test-manifest",
+        mvn"androidx.compose.ui:ui-tooling"
+      )
+    else
+      Seq.empty[Dep]
+  }
+
+  override def mvnDeps: T[Seq[Dep]] = super.mvnDeps() ++ Seq(
     mvn"androidx.glance:glance-appwidget:1.1.1",
     mvn"androidx.glance:glance-material3:1.1.1",
     mvn"org.jetbrains.kotlin:kotlin-stdlib-jdk8:${build.Versions.kotlinVersion}",
@@ -61,14 +73,12 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
     mvn"androidx.compose.ui:ui-viewbinding",
     mvn"androidx.compose.ui:ui-text-google-fonts",
     mvn"androidx.databinding:viewbinding:8.13.0",
-    mvn"androidx.compose.ui:ui-tooling",
     mvn"androidx.compose.ui:ui-tooling-preview",
-    mvn"androidx.compose.ui:ui-test-manifest",
     mvn"com.google.android.material:material:1.6.0"
-  )
+  ) ++ debugMvnDeps()
 
 
-  object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8AppModule {
+  object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8InstrumentedTestsModule {
     override def bomMvnDeps = super.mvnDeps() ++ Seq(
       mvn"androidx.compose:compose-bom:2025.08.00"
     )
@@ -81,8 +91,6 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
       true
     }
 
-    // FIXME: R8 should compile without missing classes errors
-    override def androidR8Args = Seq("--map-diagnostics", "error", "warning")
 
     def mvnDeps = super.mvnDeps() ++ Seq(
       mvn"junit:junit:4.13.2",
@@ -92,14 +100,7 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
       mvn"androidx.test:rules:1.6.1",
       mvn"androidx.test.ext:junit:1.2.1",
       mvn"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2",
-      mvn"androidx.compose.ui:ui-test",
-      mvn"androidx.compose.ui:ui-test-junit4",
-      mvn"androidx.collection:collection-ktx:1.5.0",
-
-      // Resolve conflicts
-      mvn"androidx.savedstate:savedstate-ktx:1.3.0",
-      mvn"androidx.appcompat:appcompat:1.7.0",
-      mvn"androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0"
+      mvn"androidx.compose.ui:ui-test-junit4"
     )
 
   }

Jetsnack/package.mill

@@ -50,7 +50,7 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
     mvn"androidx.savedstate:savedstate-ktx:1.3.1"
   )
 
-  object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8AppModule {
+  object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8InstrumentedTestsModule {
 
     override def androidEnableCompose: T[Boolean] = Task {
       true
@@ -75,10 +75,7 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
       mvn"androidx.test:rules:1.7.0",
       mvn"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2",
       mvn"androidx.compose.ui:ui-test",
-      mvn"androidx.compose.ui:ui-test-junit4",
-
-      // Resolve conflicts
-      mvn"androidx.savedstate:savedstate-ktx:1.3.0"
+      mvn"androidx.compose.ui:ui-test-junit4"
     )
 
   }

build.mill

@@ -1,4 +1,4 @@
-//| mill-version: 1.0.6-18-01285d
+//| mill-version: 1.1.0-RC1
 package build
 import mill.*, androidlib.*, kotlinlib.*
 
@@ -23,4 +23,4 @@ trait BaseAndroidModule extends AndroidAppKotlinModule {
 
   def androidMinSdk = Versions.androidMinSdk
 
-}
+}