Merge branch 'development' into 'master'

Javinator9889 · Apr 21, 2020 · 5d2d0a0 · 5d2d0a0
2 parents b60f650 + 0e53694
commit 5d2d0a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,7 +43,7 @@ android {
         applicationId "com.javinator9889.handwashingreminder"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 101
+        versionCode 103
         versionName "1.1.0-${gitCommitHash}"
         multiDexEnabled true
         resConfigs "en", "es"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -57,12 +57,18 @@
 }
 
 # https://bumptech.github.io/glide/doc/download-setup.html#proguard
+# https://github.com/bumptech/glide/blob/master/library/proguard-rules.txt
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
 -keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
   **[] $VALUES;
   public *;
 }
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
 -dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
 # Klaxon
 -keep public class kotlin.reflect.jvm.internal.impl.** { public *; }