diff --git a/app/build.gradle b/app/build.gradle index 3984bbd63..a2e594483 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,11 +14,19 @@ android { buildTypes { debug { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), + 'proguard-rules.pro', + '../rippleold/proguard-rules.pro', + '../vectorold/proguard-rules.pro', + '../conaco/proguard-rules.pro' } release { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), + 'proguard-rules.pro', + '../rippleold/proguard-rules.pro', + '../vectorold/proguard-rules.pro', + '../conaco/proguard-rules.pro' } } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 988b459fd..54aed3f4b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,10 +20,6 @@ -keepattributes SourceFile,LineNumberTable # For ObjectAnimator --keepclassmembers public class * extends com.hippo.vectorold.drawable.VectorDrawable.VGroup { - void set*(***); - *** get*(); -} -keepclassmembers public class * extends com.hippo.scene.Scene { void setBackgroundColor(int); int getBackgroundColor(); @@ -41,16 +37,7 @@ float getProgress(); } -#For VectorResources --keep class android.content.res.VectorResources {*;} - -# For fresco --keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip --keep @com.facebook.common.internal.DoNotStrip class * --keepclassmembers class * { - @com.facebook.common.internal.DoNotStrip *; +# Scene +-keepclassmembers class * extends com.hippo.scene.preference.PreferenceBase { + public static android.support.v7.widget.RecyclerView$ViewHolder createViewHolder(android.content.Context, android.view.ViewGroup); } --dontwarn okio.** --dontwarn javax.annotation.** --keep class com.facebook.imagepipeline.gif.** { *; } --keep class com.facebook.imagepipeline.webp.** { *; }