From f66151f88096c616652a1b1c69304c1edfd1ab07 Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 5 Aug 2022 15:13:43 +0800 Subject: [PATCH] Clean up proguards --- app/proguard-rules.pro | 27 ++++++++------------------- gradle.properties | 2 +- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 405eeff53..320dd6f21 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -7,30 +7,19 @@ public static void throw*(...); } --keep class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BaseFragment { } --keep class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BasePreferenceFragment { } +-keepclasseswithmembernames,includedescriptorclasses class * { + native ; +} + +-keep,allowoptimization class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BaseFragment { } +-keep,allowoptimization class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BasePreferenceFragment { } -keepnames class com.hippo.ehviewer.ui.scene.* { } --keep class com.hippo.ehviewer.dao.* { *; } - -keepattributes SourceFile,LineNumberTable + -renamesourcefileattribute -repackageclasses -allowaccessmodification +-mergeinterfacesaggressively -overloadaggressively - --dontwarn net.sqlcipher.database.** --dontwarn rx.** --dontwarn org.conscrypt.ConscryptHostnameVerifier --dontwarn org.conscrypt.Conscrypt$Version --dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider --dontwarn org.bouncycastle.jsse.BCSSLSocket --dontwarn org.openjsse.javax.net.ssl.SSLParameters --dontwarn net.sqlcipher.Cursor --dontwarn org.bouncycastle.jsse.BCSSLParameters --dontwarn org.conscrypt.Conscrypt --dontwarn org.openjsse.javax.net.ssl.SSLSocket --dontwarn org.openjsse.net.ssl.OpenJSSE - --keepclasseswithmembernames class * { native ;} diff --git a/gradle.properties b/gradle.properties index 2d7bff8b1..319ee4fef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.parallel=true android.useAndroidX=true android.enableJetifier=true android.enableAppCompileTimeRClass=true