From 5c1716ffefed715b9d62f7d4b32c89136b9a60e3 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
Date: Fri, 17 May 2024 19:43:30 -0400
Subject: [PATCH] Workaround invalid org.xmlpull loader with R8 (#3604)

* build: move to semi-modern xmlpull version

* fix: prevent stripping invalid service loader

* fix: rework the 'release'/'publish' plan
---
 brut.apktool/apktool-cli/build.gradle.kts   | 2 --
 brut.apktool/apktool-cli/proguard-rules.pro | 3 +++
 build.gradle.kts                            | 4 +---
 gradle/libs.versions.toml                   | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/brut.apktool/apktool-cli/build.gradle.kts b/brut.apktool/apktool-cli/build.gradle.kts
index 50b8d8fb..f2b4ce9e 100644
--- a/brut.apktool/apktool-cli/build.gradle.kts
+++ b/brut.apktool/apktool-cli/build.gradle.kts
@@ -74,5 +74,3 @@ tasks.register<JavaExec>("proguard") {
         originalJar.toString()
     )
 }
-
-tasks.getByPath(":release").dependsOn("proguard")
diff --git a/brut.apktool/apktool-cli/proguard-rules.pro b/brut.apktool/apktool-cli/proguard-rules.pro
index 24ef7b0b..950d414f 100644
--- a/brut.apktool/apktool-cli/proguard-rules.pro
+++ b/brut.apktool/apktool-cli/proguard-rules.pro
@@ -5,3 +5,6 @@
     static **[] values();
     static ** valueOf(java.lang.String);
 }
+
+# https://github.com/iBotPeaches/Apktool/issues/3602#issuecomment-2117317880
+-dontwarn org.xmlpull.mxp1**
diff --git a/build.gradle.kts b/build.gradle.kts
index c728093d..39a59561 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -158,10 +158,8 @@ subprojects {
     }
 }
 
-// Used for official releases.
 task("release") {
-    dependsOn("build")
-    finalizedBy("publish")
+  // Used for official releases.
 }
 
 tasks.wrapper {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index afabc1c4..ad597608 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ guava = "32.0.1-jre"
 junit = "4.13.2"
 r8 = "8.3.37"
 smali = "3.0.7"
-xmlpull = "1.1.4c"
+xmlpull = "1.1.6"
 xmlunit = "2.10.0"
 
 [libraries]
@@ -21,5 +21,5 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" }
 junit = { module = "junit:junit", version.ref = "junit" }
 r8 = { module = "com.android.tools:r8", version.ref = "r8" }
 smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
-xmlpull = { module = "xpp3:xpp3", version.ref = "xmlpull" }
+xmlpull = { module = "org.ogce:xpp3", version.ref = "xmlpull" }
 xmlunit = { module = "org.xmlunit:xmlunit-legacy", version.ref = "xmlunit" }