From 4b2c8514cbd352f8929297395dc02842db0ec104 Mon Sep 17 00:00:00 2001 From: Rohit Verma Date: Mon, 23 Jun 2025 18:46:37 +0530 Subject: [PATCH 1/3] chore: add R8 rules to prevent obfuscating file usage classes --- app/proguard-rules.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 63981633bd..21c584ba9c 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -66,6 +66,9 @@ # Application classes that will be serialized/deserialized over Gson -keep class com.google.gson.examples.android.model.** { *; } +# Prevent R8 from obfuscating project classes used by Gson for parsing +-keep class fr.free.nrw.commons.fileusages.** { *; } + # Prevent proguard from stripping interface information from TypeAdapterFactory, # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) -keep class * implements com.google.gson.TypeAdapterFactory From 9800c0a91e064486a1742acd66e48633c2a55fa3 Mon Sep 17 00:00:00 2001 From: Rohit Verma Date: Mon, 23 Jun 2025 18:48:15 +0530 Subject: [PATCH 2/3] chore: upgrade lifecycle-runtime dependency to resolve lint errors --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index afb3615d2e..f38357b045 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,7 @@ leakcanary = "2.10" livedataTesting = "1.2.0" swipelayout = "1.2.0" viewpagerIndicator = "2.4.1.1" -lifecycleRuntimeKtx = "2.8.4" +lifecycleRuntimeKtx = "2.8.7" loggingInterceptor = "4.10.0" logbackAndroidClassic = "1.1.1-6" material = "1.12.0" From 64af32ab41a8da67b829c08f6a6971007af08a2f Mon Sep 17 00:00:00 2001 From: Rohit Verma Date: Tue, 24 Jun 2025 17:12:48 +0530 Subject: [PATCH 3/3] remove invalid resource directory --- .../main/res/values-x-invalidLanguageCode/error.xml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 app/src/main/res/values-x-invalidLanguageCode/error.xml diff --git a/app/src/main/res/values-x-invalidLanguageCode/error.xml b/app/src/main/res/values-x-invalidLanguageCode/error.xml deleted file mode 100644 index f4e2fe125e..0000000000 --- a/app/src/main/res/values-x-invalidLanguageCode/error.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - کامَنٕز گوو رُکِتھ - Oops. کیہہ تام گوو غلط! - ؤنِیوٚ اَسہِ توٚہہِ کیاہ ٲسِیوٚ کران، تہٕ کٕریٚو تہِ اَسہِ سٕتی شیر بذریعہِ برقی خط. یُس مَدَتھ کَرِ اَسہِ اَتھ شہَرنَس منٛز! - شُکریہ! -