Merge remote-tracking branch 'refs/remotes/commons-app/master'

This commit is contained in:
Josephine Lim 2017-02-28 21:50:54 +10:00
commit f52c1819b5
2 changed files with 3 additions and 2 deletions

View file

@ -39,7 +39,7 @@ android {
buildTypes {
release {
minifyEnabled true
minifyEnabled false // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently and try reverting if the proguard.cfg modification is enough.
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}

View file

@ -1,3 +1,4 @@
-dontobfuscate
-keep class org.apache.http.** { *; }
-dontwarn org.apache.http.**
-dontwarn org.apache.http.**
-keep class fr.free.nrw.commons.upload.MwVolleyApi$Page {*;}