Skip to content

Commit 9f4729a

Browse files
committed
fix: android builder firebase proguard keep rules
Backporting rules that were already applied when newFirebaseMessaging was on, but they are needed in all cases.
1 parent 8aebb8e commit 9f4729a

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -3167,11 +3167,8 @@ public void usesClassMethod(String cls, String method) {
31673167

31683168
String keepOverride = request.getArg("android.proguardKeepOverride", "Exceptions, InnerClasses, Signature, Deprecated, SourceFile, LineNumberTable, *Annotation*, EnclosingMethod");
31693169

3170-
String keepFirebase = "";
3171-
if (newFirebaseMessaging) {
3172-
keepFirebase = "-keep class com.google.android.gms.** { *; }\n\n" +
3173-
"-keep class com.google.firebase.** { *; }\n\n";
3174-
}
3170+
String keepFirebase = "-keep class com.google.android.gms.** { *; }\n\n" +
3171+
"-keep class com.google.firebase.** { *; }\n\n";
31753172
// workaround broken optimizer in proguard
31763173
String proguardConfigOverride = "-dontusemixedcaseclassnames\n"
31773174
+ "-dontskipnonpubliclibraryclasses\n"

0 commit comments

Comments
 (0)