Merge pull request #244 from Henry-ZHR/proguard

优化混淆规则

Author: rRemix

Diff for: app/proguard-rules.pro

@@ -1,170 +1,40 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in d:\Android\sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-#指定代码的压缩级别
--optimizationpasses 5
-#包明不混合大小写
--dontusemixedcaseclassnames
-#优化  不优化输入的类文件
--dontoptimize
-#混淆时是否记录日志
--verbose
-#混淆时所采用的算法
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-#保持哪些类不被混淆
-#保护注解
 -keepattributes *Annotation*
--keepattributes Signature
--keepattributes EnclosingMethod
-#崩溃信息
--keepattributes SourceFile,LineNumberTable
 
-#basedata
--keepclasseswithmembers class * implements java.io.Serializable{
-    <fields>;
-    <methods>;
-}
--keep class **.bean.**{*;}
-# 保留Parcelable序列化类不被混淆
--keep class * implements android.os.Parcelable {
-    public static final android.os.Parcelable$Creator *;
-}
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
--keepclasseswithmembers class * implements android.os.Parcelable{
+-keepclasseswithmembers class * implements java.io.Serializable {
     <fields>;
     <methods>;
 }
--keep class * extends remix.myplayer.ui.adapter.holder.BaseViewHolder{*;}
--keep,allowshrinking,allowoptimization,allowobfuscation class remix.myplayer.ui.adapter.BaseAdapter
--keep,allowshrinking,allowoptimization,allowobfuscation class * extends remix.myplayer.ui.adapter.BaseAdapter
 
--keep class **.R$* {*;}
--keep public class remix.myplayer.R$*{
-public static final int *;
-}
+-keep class remix.myplayer.bean.** { *; }
 -keepclassmembers class ** {
     @remix.myplayer.misc.handler.OnHandleMessage public *;
 }
 
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
--keep public class * extends java.lang.annotation.Annotation
--keep public class * extends android.os.Handler
--keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
-
--keep public class **.R$*{
-   public static final int *;
-}
-
-# Keep native methods
--keepclassmembers class * {
-    native <methods>;
-}
-
--dontwarn okio.**
--dontwarn com.squareup.okhttp.**
--dontwarn okhttp3.**
--dontwarn javax.annotation.**
--dontwarn com.android.volley.toolbox.**
--dontwarn com.facebook.infer.**
-
-
-#retrofit2
--dontwarn retrofit2.**
--keep class retrofit2.** { *; }
--if interface * { @retrofit2.http.* public *** *(...); }
--keep,allowoptimization,allowshrinking,allowobfuscation class <3>
-
--keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
- long producerIndex;
- long consumerIndex;
-}
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
- rx.internal.util.atomic.LinkedQueueNode producerNode;
-}
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
- rx.internal.util.atomic.LinkedQueueNode consumerNode;
-}
-
-# FastScrollRecycleView
--keep class com.simplecityapps.recyclerview_fastscroll.** { *; }
-
-#rxpermission
--keep class com.tbruyelle.rxpermissions.**{*;}
-
-#lambda
--dontwarn java.lang.invoke.*
--dontwarn **$$Lambda$*
-
-# 如果你需要兼容6.0系统，请不要混淆org.apache.http.legacy.jar
--dontwarn android.net.compatibility.**
--dontwarn android.net.http.**
--dontwarn com.android.internal.http.multipart.**
--dontwarn org.apache.commons.**
--dontwarn org.apache.http.**
--keep class android.net.compatibility.**{*;}
--keep class android.net.http.**{*;}
--keep class com.android.internal.http.multipart.**{*;}
--keep class org.apache.commons.**{*;}
--keep class org.apache.http.**{*;}
-
-#kotlin
--dontwarn kotlin.**
-
-#bugly
+# bugly
+# https://bugly.qq.com/docs/user-guide/instruction-manual-android/
+-keep public class com.tencent.bugly.** { *; }
 -dontwarn com.tencent.bugly.**
--keep public class com.tencent.bugly.**{*;}
-
-#coroutine
--keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
--keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
--keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
--keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
--keepclassmembernames class kotlinx.** {
-    volatile <fields>;
-}
-
-# kotlinx
--dontwarn kotlinx.**
--keepnames class kotlinx.** { *; }
--keepclassmembernames class kotlinx.** {
-    volatile <fields>;
-}
 
-# logback-android
--keep class ch.qos.** { *; }
--keep class org.slf4j.** { *; }
--keepattributes *Annotation*
--dontwarn ch.qos.logback.core.net.*
+# gson
+# https://r8.googlesource.com/r8/+/refs/heads/master/compatibility-faq.md
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
 
-#jaudiotagger
+# jaudiotagger
+# Simply keep all classes as they use reflection
 -keep class org.jaudiotagger.** { *; }
 -dontwarn org.jaudiotagger.**
 
-# Gson
--keep class com.google.gson.reflect.TypeToken { *; }
--keep class * extends com.google.gson.reflect.TypeToken
+# logback-android
+# https://github.com/tony19/logback-android/issues/229
+# They've added consumer-rules.pro, but it seems to be unused
+-keepclassmembers class ch.qos.logback.classic.pattern.* { <init>(); }
+-keepclassmembers class ch.qos.logback.** { *; }
+-keepclassmembers class org.slf4j.impl.** { *; }
+-dontwarn ch.qos.logback.core.net.*
+# The classes used in app/src/main/assets/logback.xml
+# We need these rules to avoid ClassNotFoundException
+# Why this isn't mentioned in their document?
+-keep class ch.qos.logback.classic.android.LogcatAppender
+-keep class ch.qos.logback.core.rolling.RollingFileAppender
+-keep class ch.qos.logback.core.rolling.TimeBasedRollingPolicy

Diff for: gradle/libs.versions.toml

@@ -4,7 +4,7 @@ kotlin = "1.9.23"
 ksp = "1.9.23-1.0.19"
 
 glide = "4.16.0"
-retrofit = "2.9.0"
+retrofit = "2.11.0"
 room = "2.6.1"
 
 
@@ -52,15 +52,15 @@ room-rxjava2 = { group = "androidx.room", name = "room-rxjava2", version.ref = "
 android-crop = { group = "com.soundcloud.android", name = "android-crop", version = "1.0.1" }
 bugly = { group = "com.tencent.bugly", name = "crashreport", version = "3.3.3" }
 leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version = "2.13" }
-logback-android = { group = "com.github.tony19", name = "logback-android", version = "2.0.0" }
+logback-android = { group = "com.github.tony19", name = "logback-android", version = "3.0.0" }
 material-dialog = { group = "com.afollestad.material-dialogs", name = "core", version = "0.9.6.0" }
 rebound = { group = "com.facebook.rebound", name = "rebound", version = "0.3.8" }
 rxandroid = { group = "io.reactivex.rxjava2", name = "rxandroid", version = "2.1.1" }
 rxjava = { group = "io.reactivex.rxjava2", name = "rxjava", version = "2.2.19" }
 # noinspection GradleDependency
 rxpermissions = { group = "com.github.tbruyelle", name = "rxpermissions", version = "0.11" }
 sardine-android = { group = "com.github.thegrizzlylabs", name = "sardine-android", version = "0.9" }
-slf4j = { group = "org.slf4j", name = "slf4j-api", version = "2.0.4" }
+slf4j = { group = "org.slf4j", name = "slf4j-api", version = "2.0.13" }
 timber = { group = "com.jakewharton.timber", name = "timber", version = "5.0.1" }
 # noinspection GradleDependency
 tinypinyin = { group = "io.github.biezhi", name = "TinyPinyin", version = "2.0.3.RELEASE" }