diff --git a/app/build.gradle b/app/build.gradle index 1287bd5798..9811f02424 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -243,7 +243,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version_kotlin_coroutines" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version_kotlin_coroutines" - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.4.0' implementation 'com.android.support:multidex:1.0.3' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation 'com.android.support:cardview-v7:30.0.2' @@ -251,8 +251,8 @@ dependencies { implementation 'android.arch.work:work-runtime-ktx:1.0.1' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2' implementation "com.google.android.gms:play-services-location:17.0.0" - implementation 'com.github.bumptech.glide:glide:4.10.0' - kapt 'com.github.bumptech.glide:compiler:4.10.0' + implementation 'com.github.bumptech.glide:glide:4.12.0' + kapt 'com.github.bumptech.glide:compiler:4.12.0' implementation 'com.otaliastudios:cameraview:2.7.1' //Firebase SDKs diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 60e9dfd21f..bd4faf8f4f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -127,11 +127,16 @@ # for Glide -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 { + (...); +} -keep public enum com.bumptech.glide.load.ImageHeaderParser$** { **[] $VALUES; public *; } +-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { + *** rewind(); +} #third party camera -keep class com.otaliastudios.cameraview.** { *; }