fix: 🐛 修复proguard bug

kagg886 · Nov 8, 2024 · 2459fd2 · 2459fd2
1 parent 790cc3a
commit 2459fd2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -161,6 +161,7 @@ android {
     configurations {
         all {
             exclude("net.sf.kxml","kxml2")
+            exclude("xmlpull","xmlpull")
         }
     }
 

diff --git a/composeApp/proguard-rules.pro b/composeApp/proguard-rules.pro
@@ -1,6 +1,28 @@
 -dontwarn org.slf4j.impl.StaticLoggerBinder
+
+-keep class * implements org.slf4j.ILoggerFactory {
+    <init>(...);
+    <methods>;
+}
+
 # 保留所有实现了 Screen 的子类及其成员和方法
 -keep class * extends cafe.adriel.voyager.core.screen.Screen {
     <init>(...);
     <methods>;
-}
+}
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+# 保留所有实现了 Screen 的子类及其成员和方法
+-keep class * extends cafe.adriel.voyager.core.screen.Screen {
+    <init>(...);
+    <methods>;
+}
+
+-keep class org.xmlpull.v1.XmlPullParser { *; }
+-keep class * extends org.xmlpull.v1.XmlPullParser {
+    <init>(...);
+    <methods>;
+}
+
+-dontwarn org.xmlpull.v1.**
+-dontwarn org.xmlpull.mxp1.**
diff --git a/composeApp/src/commonMain/kotlin/top/kagg886/pmf/App.kt b/composeApp/src/commonMain/kotlin/top/kagg886/pmf/App.kt
@@ -36,6 +36,7 @@ import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
 import org.koin.java.KoinJavaComponent.inject
+import org.xmlpull.v1.XmlPullParser
 import top.kagg886.pmf.backend.AppConfig
 import top.kagg886.pmf.backend.database.AppDatabase
 import top.kagg886.pmf.backend.pixiv.PixivConfig
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,6 +161,7 @@ android { @@
         configurations {
             all {
                 exclude("net.sf.kxml","kxml2")
+                exclude("xmlpull","xmlpull")
             }
         }
@@ Expand Down @@