From 2459fd29d8687f8206f2e28ef5d7c1e1df295bc7 Mon Sep 17 00:00:00 2001 From: kagg886 Date: Fri, 8 Nov 2024 12:36:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8Dproguar?= =?UTF-8?q?d=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composeApp/build.gradle.kts | 1 + composeApp/proguard-rules.pro | 24 ++++++++++++++++++- .../commonMain/kotlin/top/kagg886/pmf/App.kt | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 01f5d36..d901c62 100644 --- 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 index ecf1330..c0ece1e 100644 --- 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 { + (...); + ; +} + # 保留所有实现了 Screen 的子类及其成员和方法 -keep class * extends cafe.adriel.voyager.core.screen.Screen { (...); ; -} \ No newline at end of file +} + +-dontwarn org.slf4j.impl.StaticLoggerBinder +# 保留所有实现了 Screen 的子类及其成员和方法 +-keep class * extends cafe.adriel.voyager.core.screen.Screen { + (...); + ; +} + +-keep class org.xmlpull.v1.XmlPullParser { *; } +-keep class * extends org.xmlpull.v1.XmlPullParser { + (...); + ; +} + +-dontwarn org.xmlpull.v1.** +-dontwarn org.xmlpull.mxp1.** \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/top/kagg886/pmf/App.kt b/composeApp/src/commonMain/kotlin/top/kagg886/pmf/App.kt index eed0f7b..97021c3 100644 --- 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