Eliminate need for extra dependencies and mapping r8 errors to warnings + cleanup compose examples

Author: vaslabs

example/thirdparty/android-compose-samples/build.mill

@@ -2,7 +2,6 @@ import mill.*, androidlib.*, kotlinlib.*
 
 object Versions {
   val kotlinVersion = "2.1.20"
-  val kotlinLanguageVersion = "1.9"
 
   val androidCompileSdk = 33
   val androidMinSdk = 21
@@ -17,8 +16,6 @@ object JetLagged extends mill.api.Module {
   object app extends AndroidAppKotlinModule, AndroidR8AppModule {
     def kotlinVersion = Versions.kotlinVersion
 
-    def kotlinLanguageVersion = Versions.kotlinLanguageVersion
-
     def androidIsDebug = true
 
     override def androidDebugSettings: T[AndroidBuildTypeSettings] = Task {
@@ -61,15 +58,8 @@ object JetLagged extends mill.api.Module {
       mvn"androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0",
       mvn"androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0",
       mvn"androidx.navigation:navigation-compose:2.9.0",
-      mvn"androidx.emoji2:emoji2:1.5.0",
-      mvn"androidx.emoji2:emoji2-views:1.5.0",
-      mvn"androidx.emoji2:emoji2-bundled:1.5.0",
-      mvn"androidx.window:window:1.3.0",
-      mvn"androidx.window.extensions.core:core:1.0.0",
+      mvn"androidx.window:window:1.4.0",
       mvn"androidx.constraintlayout:constraintlayout-compose:1.1.1",
-      mvn"io.coil-kt:coil-compose:2.7.0",
-      mvn"androidx.customview:customview-poolingcontainer:1.0.0",
-      mvn"androidx.tracing:tracing:1.2.0",
       mvn"org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1",
 
       // version is resolved from compose-bom
@@ -79,7 +69,6 @@ object JetLagged extends mill.api.Module {
       mvn"androidx.compose.ui:ui-util",
       mvn"androidx.compose.material3:material3",
       mvn"androidx.compose.animation:animation",
-      mvn"androidx.compose.animation:animation-tooling-internal",
       mvn"androidx.compose.material:material-icons-extended",
       mvn"androidx.compose.material:material",
       mvn"androidx.compose.material3:material3-window-size-class",
@@ -117,10 +106,6 @@ object JetLagged extends mill.api.Module {
         true
       }
 
-      // FIXME: ideally R8 should compile without erroring, but the app seems to be working
-      // without some reportedly missing classes.
-      override def androidR8Args = Seq("--map-diagnostics", "error", "warning")
-
       def mvnDeps = super.mvnDeps() ++ Seq(
         mvn"junit:junit:4.13.2",
         mvn"androidx.test:core:1.6.1",
@@ -140,8 +125,6 @@ object JetNews extends mill.api.Module {
   object app extends AndroidAppKotlinModule, AndroidR8AppModule {
     def kotlinVersion = Versions.kotlinVersion
 
-    def kotlinLanguageVersion = Versions.kotlinLanguageVersion
-
     def androidIsDebug = true
 
     override def androidDebugSettings: T[AndroidBuildTypeSettings] = Task {
@@ -183,15 +166,8 @@ object JetNews extends mill.api.Module {
       mvn"androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0",
       mvn"androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0",
       mvn"androidx.navigation:navigation-compose:2.9.0",
-      mvn"androidx.emoji2:emoji2:1.5.0",
-      mvn"androidx.emoji2:emoji2-views:1.5.0",
-      mvn"androidx.emoji2:emoji2-bundled:1.5.0",
       mvn"androidx.window:window:1.4.0",
-      mvn"androidx.window.extensions.core:core:1.0.0",
       mvn"androidx.constraintlayout:constraintlayout-compose:1.1.1",
-      mvn"io.coil-kt:coil-compose:2.7.0",
-      mvn"androidx.customview:customview-poolingcontainer:1.0.0",
-      mvn"androidx.tracing:tracing:1.2.0",
       mvn"org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1",
       mvn"androidx.glance:glance-appwidget:1.2.0-alpha01",
       mvn"androidx.glance:glance-material3:1.2.0-alpha01",
@@ -241,10 +217,6 @@ object JetNews extends mill.api.Module {
         true
       }
 
-      // FIXME: ideally R8 should compile without erroring, but the app seems to be working
-      // without some reportedly missing classes.
-      override def androidR8Args = Seq("--map-diagnostics", "error", "warning")
-
       def mvnDeps = super.mvnDeps() ++ Seq(
         mvn"junit:junit:4.13.2",
         mvn"androidx.test:core:1.6.1",

libs/androidlib/resources/proguard-android-test.txt

@@ -0,0 +1,2 @@
+#junit transitive dependency, referencing javax.lang
+-dontwarn  com.google.errorprone.annotations.**

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

@@ -917,6 +917,14 @@ trait AndroidAppModule extends AndroidModule { outer =>
       "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    override def androidCommonProguardFiles: T[Seq[PathRef]] = Task {
+      val resource = "proguard-android-test.txt"
+      val resourceUrl = getClass.getResourceAsStream(s"/$resource")
+      val dest = Task.dest / resource
+      os.write(dest, resourceUrl)
+      super.androidCommonProguardFiles() :+ PathRef(dest)
+    }
+
     private def androidInstrumentedTestsBaseManifest: Task[Elem] = Task.Anon {
       val label = s"Tests for ${outer.androidApplicationId}"
       val instrumentationName = testFramework()

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

@@ -172,14 +172,17 @@ trait AndroidModule extends JavaModule { outer =>
     rules
   }
 
-  // Common Proguard Rules used by AGP
-  // Source: https://android.googlesource.com/platform/tools/base/+/refs/heads/studio-master-dev/build-system/gradle-core/src/main/resources/com/android/build/gradle/proguard-common.txt
-  def commonProguardFile: T[PathRef] = Task {
+  /**
+   * Common Proguard Rules used by AGP
+   *
+   * Source: https://android.googlesource.com/platform/tools/base/+/refs/heads/studio-master-dev/build-system/gradle-core/src/main/resources/com/android/build/gradle/proguard-common.txt
+   */
+  def androidCommonProguardFiles: T[Seq[PathRef]] = Task {
     val resource = "proguard-common.txt"
     val resourceUrl = getClass.getResourceAsStream(s"/$resource")
     val dest = Task.dest / resource
     os.write(dest, resourceUrl)
-    PathRef(dest)
+    Seq(PathRef(dest))
   }
 
   def androidProguard: T[PathRef] = Task {

libs/androidlib/src/mill/androidlib/AndroidR8AppModule.scala

@@ -137,10 +137,6 @@ trait AndroidR8AppModule extends AndroidAppModule {
       androidReleaseSettings()
   }
 
-  def androidR8ExtraRules: T[Seq[String]] = Task {
-    Seq.empty[String]
-  }
-
   /**
    * Prepares the R8 cli command to build this android app!
    * @return
@@ -164,7 +160,7 @@ trait AndroidR8AppModule extends AndroidAppModule {
     destDir / "res"
 
     // Instruct R8 to print seeds and usage.
-    val extraRules = androidR8ExtraRules() ++ Seq(
+    val extraRules = Seq(
       s"-printseeds $seedsOut",
       s"-printusage $usageOut"
     )
@@ -241,10 +237,8 @@ trait AndroidR8AppModule extends AndroidAppModule {
         "--pg-conf",
         androidProguard().path.toString,
         "--pg-conf",
-        extraRulesFile.toString,
-        "--pg-conf",
-        commonProguardFile().path.toString
-      )
+        extraRulesFile.toString
+      ) ++ androidCommonProguardFiles().flatMap(pgf => Seq("--pg-conf", pgf.path.toString))
 
     r8ArgsBuilder ++= pgArgs