Skip to content

Fix/file usage not working #6354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 24, 2025
Merged

Fix/file usage not working #6354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b2c851
chore: add R8 rules to prevent obfuscating file usage classes
rohit9625 Jun 23, 2025
9800c0a
chore: upgrade lifecycle-runtime dependency to resolve lint errors
rohit9625 Jun 23, 2025
9508291
Merge branch 'commons-app:main' into fix/file-usage-not-working
rohit9625 Jun 24, 2025
64af32a
remove invalid resource directory
rohit9625 Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/proguard-rules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions app/src/main/res/values-x-invalidLanguageCode/error.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down