fix: android builder firebase proguard keep rules

Backporting rules that were already applied when newFirebaseMessaging was on, but they are needed in all cases.
codenameone · Nov 18, 2023 · 9f4729a · 9f4729a
1 parent 8aebb8e
commit 9f4729a
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/...n/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java b/...n/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java
@@ -3167,11 +3167,8 @@ public void usesClassMethod(String cls, String method) {
 
         String keepOverride = request.getArg("android.proguardKeepOverride", "Exceptions, InnerClasses, Signature, Deprecated, SourceFile, LineNumberTable, *Annotation*, EnclosingMethod");
 
-        String keepFirebase = "";
-        if (newFirebaseMessaging) {
-            keepFirebase = "-keep class com.google.android.gms.** { *; }\n\n" +
-                    "-keep class com.google.firebase.** { *; }\n\n";
-        }
+        String keepFirebase = "-keep class com.google.android.gms.** { *; }\n\n" +
+                "-keep class com.google.firebase.** { *; }\n\n";
         // workaround broken optimizer in proguard
         String proguardConfigOverride = "-dontusemixedcaseclassnames\n"
                 + "-dontskipnonpubliclibraryclasses\n"