mirror of
https://github.com/iBotPeaches/Apktool.git
synced 2024-11-26 22:10:37 +00:00
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:
parent
6b986e9a45
commit
5c1716ffef
@ -74,5 +74,3 @@ tasks.register<JavaExec>("proguard") {
|
||||
originalJar.toString()
|
||||
)
|
||||
}
|
||||
|
||||
tasks.getByPath(":release").dependsOn("proguard")
|
||||
|
3
brut.apktool/apktool-cli/proguard-rules.pro
vendored
3
brut.apktool/apktool-cli/proguard-rules.pro
vendored
@ -5,3 +5,6 @@
|
||||
static **[] values();
|
||||
static ** valueOf(java.lang.String);
|
||||
}
|
||||
|
||||
# https://github.com/iBotPeaches/Apktool/issues/3602#issuecomment-2117317880
|
||||
-dontwarn org.xmlpull.mxp1**
|
||||
|
@ -158,10 +158,8 @@ subprojects {
|
||||
}
|
||||
}
|
||||
|
||||
// Used for official releases.
|
||||
task("release") {
|
||||
dependsOn("build")
|
||||
finalizedBy("publish")
|
||||
// Used for official releases.
|
||||
}
|
||||
|
||||
tasks.wrapper {
|
||||
|
@ -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" }
|
||||
|
Loading…
Reference in New Issue
Block a user