diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 31e4fabc2..382ebd0ee 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -28,12 +28,10 @@ public ; protected ; } --keep class * implements android.os.Parcelable { - *; -} -keep class * implements com.yunbao.common.bean.BaseModel { *; -}-keep class com.yunbao.common.bean.* { +} +-keep class com.yunbao.common.bean.** { *; } @@ -43,18 +41,7 @@ -keep class android.**{ *; } -#-keep class com.yunbao.common.activity.**{*;} -#-keep class com.yunbao.common.adapter.**{*;} -#-keep class com.yunbao.common.bean.**{*;} -#-keep class com.yunbao.common.custom.**{*;} -#-keep class * extends com.yunbao.common.activity.AbsActivity{ -# public *; -# protected *; -#} -#-keep class * extends androidx.appcompat.app.AppCompatActivity{ -# public *; -# protected *; -#} + -keep class **.R$* { public static ; } @@ -214,28 +201,28 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # -keep class * implements com.alibaba.android.arouter.facade.template.IProvider #----retrofit2 -#-keepattributes Signature, InnerClasses, EnclosingMethod -#-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations -#-keepattributes AnnotationDefault -#-keepclassmembers,allowshrinking,allowobfuscation interface * { -# @retrofit2.http.* ; -#} -#-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement* -#-dontwarn javax.annotation.** -#-dontwarn kotlin.Unit -#-dontwarn retrofit2.KotlinExtensions* -#-dontwarn retrofit2.KotlinExtensions$* -#-if interface * { @retrofit2.http.* ; } -#-keep,allowobfuscation interface <1> -#-if interface * { @retrofit2.http.* ; } -#-keep,allowobfuscation interface * extends <1> -#-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation -#-if interface * { @retrofit2.http.* public *** *(...); } -#-keep,allowoptimization,allowshrinking,allowobfuscation class <3> +-keepattributes Signature, InnerClasses, EnclosingMethod +-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations +-keepattributes AnnotationDefault +-keepclassmembers,allowshrinking,allowobfuscation interface * { + @retrofit2.http.* ; +} +-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement* +-dontwarn javax.annotation.** +-dontwarn kotlin.Unit +-dontwarn retrofit2.KotlinExtensions* +-dontwarn retrofit2.KotlinExtensions$* +-if interface * { @retrofit2.http.* ; } +-keep,allowobfuscation interface <1> +-if interface * { @retrofit2.http.* ; } +-keep,allowobfuscation interface * extends <1> +-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation +-if interface * { @retrofit2.http.* public *** *(...); } +-keep,allowoptimization,allowshrinking,allowobfuscation class <3> #-----glide -#-keep public class com.bumptech.glide.** {*;} -#-keep public class jp.co.cyberagent.** {*;} -#-dontwarn jp.co.cyberagent.android.gpuimage.** -# -#-printconfiguration tmp/full-r8-config.txt \ No newline at end of file +-keep public class com.bumptech.glide.** {*;} +-keep public class jp.co.cyberagent.** {*;} +-dontwarn jp.co.cyberagent.android.gpuimage.** + +-printconfiguration tmp/full-r8-config.txt \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 58373b876..3265ac671 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,4 +22,5 @@ android.enableJetifier=true systemProp.http.proxyHost=127.0.0.1 systemProp.https.proxyHost=127.0.0.1 systemProp.https.proxyPort=7890 -systemProp.http.proxyPort=7890 \ No newline at end of file +systemProp.http.proxyPort=7890 +#android.enableR8.fullMode=true \ No newline at end of file