From 1fac4158c3395cdc8e74edffa5654d9e17b26875 Mon Sep 17 00:00:00 2001 From: ByteHamster <info@bytehamster.com> Date: Sun, 6 Jan 2019 00:23:34 +0100 Subject: [PATCH] Fix release build --- app/build.gradle | 2 +- app/proguard.cfg | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a79ad180e..7ba2ef441 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,7 +95,7 @@ android { release { resValue "string", "provider_authority", "de.danoeh.antennapod.provider" minifyEnabled true - proguardFile "proguard.cfg" + proguardFiles getDefaultProguardFile('proguard-android.txt'), "proguard.cfg" signingConfig signingConfigs.releaseConfig buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret diff --git a/app/proguard.cfg b/app/proguard.cfg index 6bb98dc9e..6df2ae9bf 100644 --- a/app/proguard.cfg +++ b/app/proguard.cfg @@ -53,8 +53,12 @@ public *; } +# for okhttp -dontwarn okhttp3.** -dontwarn okio.** +-dontwarn javax.annotation.** +-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase +-dontwarn org.codehaus.mojo.animal_sniffer.* # for RxJava: -dontwarn sun.misc.Unsafe @@ -99,10 +103,12 @@ # Glide -keep public class * implements com.bumptech.glide.module.GlideModule --keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** { - **[] $VALUES; - public *; +-keep public class * extends com.bumptech.glide.module.AppGlideModule +-keep public enum com.bumptech.glide.load.ImageHeaderParser$** { + **[] $VALUES; + public *; } +-dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder # for ViewPageIndicator problems (https://github.com/JakeWharton/ViewPagerIndicator/issues/366): -dontwarn com.viewpagerindicator.LinePageIndicator