Skip to content

Commit 5c1716f

Browse files
authored
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
1 parent 6b986e9 commit 5c1716f

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

brut.apktool/apktool-cli/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,3 @@ tasks.register<JavaExec>("proguard") {
7474
originalJar.toString()
7575
)
7676
}
77-
78-
tasks.getByPath(":release").dependsOn("proguard")

brut.apktool/apktool-cli/proguard-rules.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
static **[] values();
66
static ** valueOf(java.lang.String);
77
}
8+
9+
# https://github.com/iBotPeaches/Apktool/issues/3602#issuecomment-2117317880
10+
-dontwarn org.xmlpull.mxp1**

build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,8 @@ subprojects {
158158
}
159159
}
160160

161-
// Used for official releases.
162161
task("release") {
163-
dependsOn("build")
164-
finalizedBy("publish")
162+
// Used for official releases.
165163
}
166164

167165
tasks.wrapper {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ guava = "32.0.1-jre"
88
junit = "4.13.2"
99
r8 = "8.3.37"
1010
smali = "3.0.7"
11-
xmlpull = "1.1.4c"
11+
xmlpull = "1.1.6"
1212
xmlunit = "2.10.0"
1313

1414
[libraries]
@@ -21,5 +21,5 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" }
2121
junit = { module = "junit:junit", version.ref = "junit" }
2222
r8 = { module = "com.android.tools:r8", version.ref = "r8" }
2323
smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
24-
xmlpull = { module = "xpp3:xpp3", version.ref = "xmlpull" }
24+
xmlpull = { module = "org.ogce:xpp3", version.ref = "xmlpull" }
2525
xmlunit = { module = "org.xmlunit:xmlunit-legacy", version.ref = "xmlunit" }

0 commit comments

Comments
 (0)