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
iBotPeaches · May 17, 2024 · 5c1716f · 5c1716f
1 parent 6b986e9
commit 5c1716f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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" }