add proguard-common.txt

Author: souvlakias

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

@@ -21,11 +21,6 @@ object JetLagged extends mill.api.Module {
 
     def androidIsDebug = true
 
-    def androidR8ExtraRules = Seq(
-      "-dontwarn androidx.window.extensions.**",
-      "-dontwarn androidx.window.sidecar.**"
-    )
-
     override def androidDebugSettings: T[AndroidBuildTypeSettings] = Task {
       AndroidBuildTypeSettings(
         isMinifyEnabled = false,
@@ -149,10 +144,6 @@ object JetNews extends mill.api.Module {
 
     def androidIsDebug = 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")
-
     override def androidDebugSettings: T[AndroidBuildTypeSettings] = Task {
       AndroidBuildTypeSettings(
         isMinifyEnabled = false,

libs/androidlib/resources/proguard-common.txt

@@ -0,0 +1,94 @@
+# 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
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Preserve some attributes that may be required for reflection.
+-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
+
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+-keep public class com.google.android.vending.licensing.ILicensingService
+-dontnote com.android.vending.licensing.ILicensingService
+-dontnote com.google.vending.licensing.ILicensingService
+-dontnote com.google.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames,includedescriptorclasses class * {
+    native <methods>;
+}
+
+# Keep setters in Views so that animations can still work.
+-keepclassmembers public class * extends android.view.View {
+    void set*(***);
+    *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick.
+-keepclassmembers class * extends android.app.Activity {
+    public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
+
+# Preserve annotated Javascript interface methods.
+-keepclassmembers class * {
+    @android.webkit.JavascriptInterface <methods>;
+}
+
+# The support libraries contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontnote android.support.**
+-dontnote androidx.**
+-dontwarn android.support.**
+-dontwarn androidx.**
+
+# This class is deprecated, but remains for backward compatibility.
+-dontwarn android.util.FloatMath
+
+# Understand the @Keep support annotation.
+-keep class android.support.annotation.Keep
+-keep class androidx.annotation.Keep
+
+-keep @android.support.annotation.Keep class * {*;}
+-keep @androidx.annotation.Keep class * {*;}
+
+-keepclasseswithmembers class * {
+    @android.support.annotation.Keep <methods>;
+}
+
+-keepclasseswithmembers class * {
+    @androidx.annotation.Keep <methods>;
+}
+
+-keepclasseswithmembers class * {
+    @android.support.annotation.Keep <fields>;
+}
+
+-keepclasseswithmembers class * {
+    @androidx.annotation.Keep <fields>;
+}
+
+-keepclasseswithmembers class * {
+    @android.support.annotation.Keep <init>(...);
+}
+
+-keepclasseswithmembers class * {
+    @androidx.annotation.Keep <init>(...);
+}
+
+# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
+-dontnote org.apache.http.**
+-dontnote android.net.http.**
+
+# These classes are duplicated between android.jar and core-lambda-stubs.jar.
+-dontnote java.lang.invoke.**

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

@@ -172,6 +172,16 @@ 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 {
+    val resource = "proguard-common.txt"
+    val resourceUrl = getClass.getResourceAsStream(s"/$resource")
+    val dest = Task.dest / resource
+    os.write(dest, resourceUrl)
+    PathRef(dest)
+  }
+
   def androidProguard: T[PathRef] = Task {
     val globalProguardFile = Task.dest / "global-proguard.pro"
     os.write(globalProguardFile, "")

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

@@ -234,9 +234,17 @@ trait AndroidR8AppModule extends AndroidAppModule {
 
     r8ArgsBuilder ++= libArgs
 
-    // ProGuard configuration files: add our extra rules file and all provided config files.
+    // ProGuard configuration files: add our extra rules file,
+    // all provided config files and the common rules.
     val pgArgs =
-      Seq("--pg-conf", androidProguard().path.toString, "--pg-conf", extraRulesFile.toString)
+      Seq(
+        "--pg-conf",
+        androidProguard().path.toString,
+        "--pg-conf",
+        extraRulesFile.toString,
+        "--pg-conf",
+        commonProguardFile().path.toString
+      )
 
     r8ArgsBuilder ++= pgArgs