From becc8b2ff5eb8028887b37f6dff2ca201f37ddfc Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Jan 2021 10:11:00 +0800 Subject: [PATCH] add proguard --- app/build.gradle | 6 +++--- foudations/httpdns-base/consumer-rules.pro | 2 ++ foudations/mogo-commons/consumer-rules.pro | 2 +- foudations/mogo-utils/consumer-rules.pro | 3 ++- skin/mogo-skin-support-impl/consumer-rules.pro | 1 + skin/mogo-skin-support/consumer-rules.pro | 4 +--- .../helper/MogoSkinCompatBackgroundHelperDelegate.java | 4 ++++ .../helper/MogoSkinCompatCompoundButtonHelperDelegate.java | 4 ++++ .../skin/support/helper/MogoSkinCompatHelperDelegate.java | 2 ++ .../support/helper/MogoSkinCompatImageHelperDelegate.java | 3 +++ .../helper/MogoSkinCompatProgressBarHelperDelegate.java | 3 +++ .../support/helper/MogoSkinCompatSeekBarHelperDelegate.java | 3 +++ .../support/helper/MogoSkinCompatTextHelperDelegate.java | 6 ++++++ .../support/helper/MogoSkinCompatTextHelperV17Delegate.java | 6 ++++++ skin/skin-support-appcompat/consumer-rules.pro | 2 +- skin/skin-support/consumer-rules.pro | 2 +- 16 files changed, 43 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0cc7023b1e..64f79ab72b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,9 +45,9 @@ android { signingConfig signingConfigs.release } release { - minifyEnabled true - zipAlignEnabled true - shrinkResources true + minifyEnabled false + zipAlignEnabled false + shrinkResources false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } diff --git a/foudations/httpdns-base/consumer-rules.pro b/foudations/httpdns-base/consumer-rules.pro index e69de29bb2..6cc51a2284 100644 --- a/foudations/httpdns-base/consumer-rules.pro +++ b/foudations/httpdns-base/consumer-rules.pro @@ -0,0 +1,2 @@ +-keep class com.mogo.httpdns.IMogoHttpDns{*;} +-keep class com.mogo.httpdns.MogoHttpDnsHandler{*;} \ No newline at end of file diff --git a/foudations/mogo-commons/consumer-rules.pro b/foudations/mogo-commons/consumer-rules.pro index 895ce25a18..932c009231 100644 --- a/foudations/mogo-commons/consumer-rules.pro +++ b/foudations/mogo-commons/consumer-rules.pro @@ -1,4 +1,4 @@ #-----Foundation-Commons----- -keep class com.mogo.commons.data.BaseData{*;} -keep class com.mogo.commons.voice.*{*;} --keep interface * implements com.mogo.commons.mvp.IView \ No newline at end of file +-keep interface * implements com.mogo.commons.mvp.*{*;} \ No newline at end of file diff --git a/foudations/mogo-utils/consumer-rules.pro b/foudations/mogo-utils/consumer-rules.pro index 1026afb6b2..5b5f0f00f9 100644 --- a/foudations/mogo-utils/consumer-rules.pro +++ b/foudations/mogo-utils/consumer-rules.pro @@ -3,4 +3,5 @@ -keep class com.mogo.utils.network.CallerRestrictTo -keep class com.mogo.utils.glide.GlideRoundedCornersTransform.CornerType -keep class com.mogo.utils.logger.LogLevel{*;} --keep class com.mogo.utils.sqlite.**{*;} \ No newline at end of file +-keep class com.mogo.utils.sqlite.**{*;} +-keep class com.mogo.utils.network.HttpDns{*;} \ No newline at end of file diff --git a/skin/mogo-skin-support-impl/consumer-rules.pro b/skin/mogo-skin-support-impl/consumer-rules.pro index e69de29bb2..c41283b874 100644 --- a/skin/mogo-skin-support-impl/consumer-rules.pro +++ b/skin/mogo-skin-support-impl/consumer-rules.pro @@ -0,0 +1 @@ +-keep class com.mogo.skin.support.impl.SkinSupportInstaller{*;} \ No newline at end of file diff --git a/skin/mogo-skin-support/consumer-rules.pro b/skin/mogo-skin-support/consumer-rules.pro index d721c116cf..5ee93a1450 100644 --- a/skin/mogo-skin-support/consumer-rules.pro +++ b/skin/mogo-skin-support/consumer-rules.pro @@ -1,3 +1 @@ --keep class com.mogo.skin.support.helper.*{*;} --keep class com.mogo.skin.support.SkinMode{*;} --keep class com.mogo.skin.support.SkinSupportInstallerConstants{*;} \ No newline at end of file +-keep class com.mogo.skin.support.**{*;} \ No newline at end of file diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatBackgroundHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatBackgroundHelperDelegate.java index a8bad07f81..a0071395ce 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatBackgroundHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatBackgroundHelperDelegate.java @@ -2,6 +2,8 @@ package com.mogo.skin.support.helper; import android.view.View; +import androidx.annotation.Keep; + import java.lang.reflect.Method; public @@ -15,6 +17,7 @@ class MogoSkinCompatBackgroundHelperDelegate extends MogoSkinCompatHelperDelegat private static Method sMethodOnSetBackgroundResource; + @Keep @Override protected String getDelegateClazzName() { return "skin.support.widget.SkinCompatBackgroundHelper"; @@ -29,6 +32,7 @@ class MogoSkinCompatBackgroundHelperDelegate extends MogoSkinCompatHelperDelegat return new Class[]{View.class}; } + @Keep public void onSetBackgroundResource( int resId ) { if ( !isSupport() ) { return; diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatCompoundButtonHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatCompoundButtonHelperDelegate.java index 434c9bc1b4..8e755983fb 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatCompoundButtonHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatCompoundButtonHelperDelegate.java @@ -3,6 +3,8 @@ package com.mogo.skin.support.helper; import android.view.View; import android.widget.CompoundButton; +import androidx.annotation.Keep; + import com.mogo.skin.support.IMogoSkinCompatSupportable; import java.lang.reflect.InvocationTargetException; @@ -28,6 +30,7 @@ class MogoSkinCompatCompoundButtonHelperDelegate extends MogoSkinCompatHelperDel return new Class[]{CompoundButton.class}; } + @Keep public void setButtonDrawable( int resId ) { if ( !isSupport() ) { return; @@ -49,6 +52,7 @@ class MogoSkinCompatCompoundButtonHelperDelegate extends MogoSkinCompatHelperDel } } + @Keep @Override protected String getDelegateClazzName() { return "skin.support.widget.SkinCompatCompoundButtonHelper"; diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java index 2bc315d12b..caa214be64 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java @@ -32,6 +32,7 @@ abstract class MogoSkinCompatHelperDelegate implements IMogoSkinCompatSupportabl initDelegateInstance( view ); } + @Keep protected void loadClazz() { if ( mTargetClazz == null ) { try { @@ -45,6 +46,7 @@ abstract class MogoSkinCompatHelperDelegate implements IMogoSkinCompatSupportabl } } + @Keep protected void initDelegateInstance( View view ) { try { if ( sConstructor == null ) { diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatImageHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatImageHelperDelegate.java index 74b913abef..127427c351 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatImageHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatImageHelperDelegate.java @@ -3,6 +3,8 @@ package com.mogo.skin.support.helper; import android.view.View; import android.widget.ImageView; +import androidx.annotation.Keep; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -26,6 +28,7 @@ class MogoSkinCompatImageHelperDelegate extends MogoSkinCompatHelperDelegate { return new Class[]{ImageView.class}; } + @Keep public void setImageResource( int resId ) { if ( !isSupport() ) { return; diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatProgressBarHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatProgressBarHelperDelegate.java index 49db770732..98a689068c 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatProgressBarHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatProgressBarHelperDelegate.java @@ -3,6 +3,8 @@ package com.mogo.skin.support.helper; import android.view.View; import android.widget.ProgressBar; +import androidx.annotation.Keep; + public /** * @author congtaowang @@ -21,6 +23,7 @@ class MogoSkinCompatProgressBarHelperDelegate extends MogoSkinCompatHelperDelega return new Class[]{ProgressBar.class}; } + @Keep @Override protected String getDelegateClazzName() { return "skin.support.widget.SkinCompatProgressBarHelper"; diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatSeekBarHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatSeekBarHelperDelegate.java index 513d45f847..32a706c839 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatSeekBarHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatSeekBarHelperDelegate.java @@ -3,6 +3,8 @@ package com.mogo.skin.support.helper; import android.view.View; import android.widget.SeekBar; +import androidx.annotation.Keep; + public /** * @author congtaowang @@ -21,6 +23,7 @@ class MogoSkinCompatSeekBarHelperDelegate extends MogoSkinCompatHelperDelegate { return new Class[]{SeekBar.class}; } + @Keep @Override protected String getDelegateClazzName() { return "skin.support.widget.SkinCompatSeekBarHelper"; diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperDelegate.java index 58f917cce2..f3d6add899 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperDelegate.java @@ -5,6 +5,7 @@ import android.view.View; import android.widget.TextView; import androidx.annotation.DrawableRes; +import androidx.annotation.Keep; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -32,6 +33,7 @@ class MogoSkinCompatTextHelperDelegate extends MogoSkinCompatHelperDelegate { return new Class[]{TextView.class}; } + @Keep public void onSetTextAppearance( Context context, int resId ) { if ( !isSupport() ) { return; @@ -56,6 +58,7 @@ class MogoSkinCompatTextHelperDelegate extends MogoSkinCompatHelperDelegate { } + @Keep public void onSetCompoundDrawablesRelativeWithIntrinsicBounds( @DrawableRes int start, @DrawableRes int top, @DrawableRes int end, @DrawableRes int bottom ) { if ( !isSupport() ) { @@ -80,6 +83,7 @@ class MogoSkinCompatTextHelperDelegate extends MogoSkinCompatHelperDelegate { } } + @Keep public void onSetCompoundDrawablesWithIntrinsicBounds( @DrawableRes int left, @DrawableRes int top, @DrawableRes int right, @DrawableRes int bottom ) { if ( !isSupport() ) { @@ -104,6 +108,7 @@ class MogoSkinCompatTextHelperDelegate extends MogoSkinCompatHelperDelegate { } } + @Keep public int getTextColorResId() { if ( !isSupport() ) { return 0; @@ -127,6 +132,7 @@ class MogoSkinCompatTextHelperDelegate extends MogoSkinCompatHelperDelegate { return 0; } + @Keep @Override protected String getDelegateClazzName() { return "skin.support.widget.SkinCompatTextHelper"; diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperV17Delegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperV17Delegate.java index fe167ab212..a96d811f9e 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperV17Delegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatTextHelperV17Delegate.java @@ -6,6 +6,7 @@ import android.view.View; import android.widget.TextView; import androidx.annotation.DrawableRes; +import androidx.annotation.Keep; import androidx.annotation.RequiresApi; import java.lang.reflect.InvocationTargetException; @@ -36,6 +37,7 @@ class MogoSkinCompatTextHelperV17Delegate extends MogoSkinCompatHelperDelegate { return new Class[]{TextView.class}; } + @Keep public void onSetTextAppearance( Context context, int resId ) { if ( !isSupport() ) { return; @@ -60,6 +62,7 @@ class MogoSkinCompatTextHelperV17Delegate extends MogoSkinCompatHelperDelegate { } + @Keep public void onSetCompoundDrawablesRelativeWithIntrinsicBounds( @DrawableRes int start, @DrawableRes int top, @DrawableRes int end, @DrawableRes int bottom ) { if ( !isSupport() ) { @@ -84,6 +87,7 @@ class MogoSkinCompatTextHelperV17Delegate extends MogoSkinCompatHelperDelegate { } } + @Keep public void onSetCompoundDrawablesWithIntrinsicBounds( @DrawableRes int left, @DrawableRes int top, @DrawableRes int right, @DrawableRes int bottom ) { if ( !isSupport() ) { @@ -108,6 +112,7 @@ class MogoSkinCompatTextHelperV17Delegate extends MogoSkinCompatHelperDelegate { } } + @Keep public int getTextColorResId() { if ( !isSupport() ) { return 0; @@ -131,6 +136,7 @@ class MogoSkinCompatTextHelperV17Delegate extends MogoSkinCompatHelperDelegate { return 0; } + @Keep @Override protected String getDelegateClazzName() { return "skin.support.widget.SkinCompatTextHelperV17"; diff --git a/skin/skin-support-appcompat/consumer-rules.pro b/skin/skin-support-appcompat/consumer-rules.pro index b8b34b0ead..7511958b62 100644 --- a/skin/skin-support-appcompat/consumer-rules.pro +++ b/skin/skin-support-appcompat/consumer-rules.pro @@ -1,2 +1,2 @@ -keep class androidx.appcompat.app.SkinAppCompatDelegateImpl{*;} --keep class skin.support.widget.*{*;} +-keep class skin.support.**{*;} \ No newline at end of file diff --git a/skin/skin-support/consumer-rules.pro b/skin/skin-support/consumer-rules.pro index 11b8621c33..44899c2a52 100644 --- a/skin/skin-support/consumer-rules.pro +++ b/skin/skin-support/consumer-rules.pro @@ -1,5 +1,5 @@ -keep class skin.support.annotation.*{*;} --keep class skin.support.app.SkinCompatViewInflater{*;} +-keep class skin.support.app.*{*;} -keep class skin.support.content.res.ColorState.*{*;} -keep class skin.support.content.res.ColorState.ColorBuilder{*;} -keep class skin.support.utils.SkinCompatVersionUtils{*;}