Fix proguard/r8 rules for Android

Libraries that require proguard rules should publish them automatically to r8 by using consumerProguardFiles. Currently, Ferrostar declared this, but left the corresponding rules files empty. This patch moves the rules from proguard-rules.pro so that R8 automatically picks them up without apps using Ferrostar needing to do anything. Moreover, it removes proguard-rules.pro and the corresponding release block from Android libraries, since whether the build type is release or debug (and whether or not r8 is enabled) is dependant on the app module.
stadiamaps · Oct 17, 2024 · a95c96e · a95c96e
1 parent adb74ca
commit a95c96e
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 117 deletions.
diff --git a/android/composeui/build.gradle b/android/composeui/build.gradle
@@ -21,12 +21,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/composeui/proguard-rules.pro b/android/composeui/proguard-rules.pro
diff --git a/android/core/build.gradle b/android/core/build.gradle
@@ -23,12 +23,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/core/consumer-rules.pro b/android/core/consumer-rules.pro
@@ -0,0 +1,8 @@
+# Ferrostar & JNA
+# TODO: This needs validation from a publishing app. Ticket https://github.com/stadiamaps/ferrostar/issues/185
+-keep class com.sun.jna.** { *; }
+-keep class uniffi.ferrostar.** { *; }
+-dontwarn java.awt.Component
+-dontwarn java.awt.GraphicsEnvironment
+-dontwarn java.awt.HeadlessException
+-dontwarn java.awt.Window
diff --git a/android/core/proguard-rules.pro b/android/core/proguard-rules.pro
diff --git a/android/google-play-services/build.gradle b/android/google-play-services/build.gradle
@@ -19,12 +19,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/google-play-services/proguard-rules.pro b/android/google-play-services/proguard-rules.pro
diff --git a/android/maplibreui/build.gradle b/android/maplibreui/build.gradle
@@ -21,12 +21,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/maplibreui/proguard-rules.pro b/android/maplibreui/proguard-rules.pro