From e9346f989ab95ce78f1c46ee9ece87bd8b8ac862 Mon Sep 17 00:00:00 2001
From: kagg886 <iveour@163.com>
Date: Thu, 28 Nov 2024 08:09:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8Dproguar?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composeApp/build.gradle.kts   | 2 ++
 composeApp/proguard-rules.pro | 7 +------
 gradle/libs.versions.toml     | 2 ++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 50d7021..8d51808 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -128,6 +128,7 @@ kotlin {
             //epub export
             implementation(libs.epublib.core.get().toString()) {
                 exclude("xmlpull", "xmlpull")
+                exclude("net.sf.kxml","kxml2")
             }
             implementation(libs.jsoup)
 
@@ -141,6 +142,7 @@ kotlin {
         desktopMain.dependencies {
             implementation(compose.desktop.currentOs)
             implementation(libs.kotlinx.coroutines.swing)
+            implementation(libs.kxml2)
         }
     }
 }
diff --git a/composeApp/proguard-rules.pro b/composeApp/proguard-rules.pro
index c0ece1e..0cc6b44 100644
--- a/composeApp/proguard-rules.pro
+++ b/composeApp/proguard-rules.pro
@@ -4,14 +4,9 @@
     <init>(...);
     <methods>;
 }
+-dontwarn org.slf4j.impl.StaticLoggerBinder
 
-# 保留所有实现了 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>(...);
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3867387..49f6689 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,6 +8,7 @@ jsoup = "1.18.1"
 kotlin = "2.0.21"
 kotlinx-coroutines = "1.9.0"
 kotlinxSerializationJson = "1.7.3"
+kxml2 = "2.3.0"
 multiplatformSettings = "1.2.0"
 orbitCore = "9.0.0"
 pixko = "1.8"
@@ -37,6 +38,7 @@ androidx-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", nam
 androidx-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.1" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
+kxml2 = { module = "net.sf.kxml:kxml2", version.ref = "kxml2" }
 multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" }
 multiplatform-settings-serialization = { module = "com.russhwolf:multiplatform-settings-serialization", version.ref = "multiplatformSettings" }
 orbit-core = { module = "org.orbit-mvi:orbit-core", version.ref = "orbitCore" }