From e56c64cb104e631a1c597ca26ce8b1cfd14bbb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Sun, 11 Aug 2024 09:55:24 +0200 Subject: [PATCH 1/3] Try fixing proguard config for nightly builds --- libraries/pushproviders/firebase/build.gradle.kts | 1 + libraries/pushproviders/firebase/proguard-rules.pro | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 libraries/pushproviders/firebase/proguard-rules.pro diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts index 1446c17c6a..05dbf2efbb 100644 --- a/libraries/pushproviders/firebase/build.gradle.kts +++ b/libraries/pushproviders/firebase/build.gradle.kts @@ -51,6 +51,7 @@ android { register("nightly") { isMinifyEnabled = true consumerProguardFiles("consumer-proguard-rules.pro") + proguardFiles("proguard-rules.pro") matchingFallbacks += listOf("release") resValue( type = "string", diff --git a/libraries/pushproviders/firebase/proguard-rules.pro b/libraries/pushproviders/firebase/proguard-rules.pro new file mode 100644 index 0000000000..82fb72d95e --- /dev/null +++ b/libraries/pushproviders/firebase/proguard-rules.pro @@ -0,0 +1,5 @@ +# Used for unit tests + +-dontwarn java.lang.invoke.StringConcatFactory + +-keep class io.element.android.libraries.pushproviders.firebase.** { *; } From e9d8ba117704ffcc2c8c92a22c07c7d2c35ac375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Sun, 11 Aug 2024 10:23:22 +0200 Subject: [PATCH 2/3] Add proguard file for firebase for release variant too --- libraries/pushproviders/firebase/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts index 05dbf2efbb..57f3b0b8ae 100644 --- a/libraries/pushproviders/firebase/build.gradle.kts +++ b/libraries/pushproviders/firebase/build.gradle.kts @@ -27,6 +27,7 @@ android { buildTypes { getByName("release") { consumerProguardFiles("consumer-proguard-rules.pro") + proguardFiles("proguard-rules.pro") resValue( type = "string", name = "google_app_id", From 7bbcc90cabf20e51da3c279c438db0658adb9cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Sun, 11 Aug 2024 12:32:28 +0200 Subject: [PATCH 3/3] Try removing `isMinified` instead. This should now be controlled at the `app` module level. --- libraries/pushproviders/firebase/build.gradle.kts | 3 --- libraries/pushproviders/firebase/proguard-rules.pro | 5 ----- 2 files changed, 8 deletions(-) delete mode 100644 libraries/pushproviders/firebase/proguard-rules.pro diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts index 57f3b0b8ae..1e6d88ec53 100644 --- a/libraries/pushproviders/firebase/build.gradle.kts +++ b/libraries/pushproviders/firebase/build.gradle.kts @@ -27,7 +27,6 @@ android { buildTypes { getByName("release") { consumerProguardFiles("consumer-proguard-rules.pro") - proguardFiles("proguard-rules.pro") resValue( type = "string", name = "google_app_id", @@ -50,9 +49,7 @@ android { ) } register("nightly") { - isMinifyEnabled = true consumerProguardFiles("consumer-proguard-rules.pro") - proguardFiles("proguard-rules.pro") matchingFallbacks += listOf("release") resValue( type = "string", diff --git a/libraries/pushproviders/firebase/proguard-rules.pro b/libraries/pushproviders/firebase/proguard-rules.pro deleted file mode 100644 index 82fb72d95e..0000000000 --- a/libraries/pushproviders/firebase/proguard-rules.pro +++ /dev/null @@ -1,5 +0,0 @@ -# Used for unit tests - --dontwarn java.lang.invoke.StringConcatFactory - --keep class io.element.android.libraries.pushproviders.firebase.** { *; }