Migrate jetsnack to new r8 instrumented tests with small test apks

vaslabs · vaslabs · commit 33a2c91cb3b3 · 2025-11-01T15:50:27.000+02:00
diff --git a/Jetsnack/package.mill b/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"
     )
 
   }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ object app extends BaseAndroidModule, AndroidR8AppModule {`
`50`	`50`	`mvn"androidx.savedstate:savedstate-ktx:1.3.1"`
`51`	`51`	`)`
`52`	`52`
`53`		`- object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8AppModule {`
	`53`	`+ object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8InstrumentedTestsModule {`
`54`	`54`
`55`	`55`	`override def androidEnableCompose: T[Boolean] = Task {`
`56`	`56`	`true`
`@@ -75,10 +75,7 @@ object app extends BaseAndroidModule, AndroidR8AppModule {`
`75`	`75`	`mvn"androidx.test:rules:1.7.0",`
`76`	`76`	`mvn"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2",`
`77`	`77`	`mvn"androidx.compose.ui:ui-test",`
`78`		`- mvn"androidx.compose.ui:ui-test-junit4",`
`79`		`-`
`80`		`- // Resolve conflicts`
`81`		`- mvn"androidx.savedstate:savedstate-ktx:1.3.0"`
	`78`	`+ mvn"androidx.compose.ui:ui-test-junit4"`
`82`	`79`	`)`
`83`	`80`
`84`	`81`	`}`