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
This commit is contained in:
Connor Tumbleson 2024-05-17 19:43:30 -04:00 committed by GitHub
parent 6b986e9a45
commit 5c1716ffef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 7 deletions

View File

@ -74,5 +74,3 @@ tasks.register<JavaExec>("proguard") {
originalJar.toString() originalJar.toString()
) )
} }
tasks.getByPath(":release").dependsOn("proguard")

View File

@ -5,3 +5,6 @@
static **[] values(); static **[] values();
static ** valueOf(java.lang.String); static ** valueOf(java.lang.String);
} }
# https://github.com/iBotPeaches/Apktool/issues/3602#issuecomment-2117317880
-dontwarn org.xmlpull.mxp1**

View File

@ -158,10 +158,8 @@ subprojects {
} }
} }
// Used for official releases.
task("release") { task("release") {
dependsOn("build") // Used for official releases.
finalizedBy("publish")
} }
tasks.wrapper { tasks.wrapper {

View File

@ -8,7 +8,7 @@ guava = "32.0.1-jre"
junit = "4.13.2" junit = "4.13.2"
r8 = "8.3.37" r8 = "8.3.37"
smali = "3.0.7" smali = "3.0.7"
xmlpull = "1.1.4c" xmlpull = "1.1.6"
xmlunit = "2.10.0" xmlunit = "2.10.0"
[libraries] [libraries]
@ -21,5 +21,5 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" }
junit = { module = "junit:junit", version.ref = "junit" } junit = { module = "junit:junit", version.ref = "junit" }
r8 = { module = "com.android.tools:r8", version.ref = "r8" } r8 = { module = "com.android.tools:r8", version.ref = "r8" }
smali = { module = "com.android.tools.smali:smali", version.ref = "smali" } 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" } xmlunit = { module = "org.xmlunit:xmlunit-legacy", version.ref = "xmlunit" }