Repository navigation
Migrate to binary-resources 32 (raises minimum Java to 17) - #623
Merged
Merged
Conversation
mateuszkwiecinski
marked this pull request as ready for review
November 21, 2026 08:55
Jar size:Jar size change: +21.4KiB (3.5MiB -> 3.5MiB) Diffuse output:JARCLASSES |
binary-resources 32 renamed BinaryResourceFile/BinaryResourceValue to ResourceFile/ResourceValue (same constructors, type()/data() and Type enum). It is also compiled to Java 17 bytecode, so the minimum supported runtime is raised from 11 to 17. Adds golden tests for the decoded binary AndroidManifest of the fixture APKs, generated with binary-resources 31.13.2. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
mateuszkwiecinski
force-pushed
the
fix/apkparser-32
branch
from
November 21, 2026 08:57
38a0c2f to
4f2cf8a
Compare
|
Dependency diff: \--- project ':formats'
- \--- com.android.tools.apkparser:binary-resources:31.13.2
- +--- com.android.tools:annotations:31.13.2
- \--- com.google.guava:guava:33.3.1-jre -> 31.0.1-jre
- +--- com.google.guava:failureaccess:1.0.1
- +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
- +--- com.google.code.findbugs:jsr305:3.0.2
- +--- org.checkerframework:checker-qual:3.12.0
- +--- com.google.errorprone:error_prone_annotations:2.7.1 -> 2.11.0
- \--- com.google.j2objc:j2objc-annotations:1.3
+ \--- com.android.tools.apkparser:binary-resources:32.5.2
+ \--- com.google.guava:guava:33.4.0-jre -> 31.0.1-jre
+ +--- com.google.guava:failureaccess:1.0.1
+ +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+ +--- com.google.code.findbugs:jsr305:3.0.2
+ +--- org.checkerframework:checker-qual:3.12.0
+ +--- com.google.errorprone:error_prone_annotations:2.7.1 -> 2.11.0
+ \--- com.google.j2objc:j2objc-annotations:1.3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #525 (Renovate bump of
com.android.tools.apkparser:binary-resources31.13.2 → 32.5.2, whose build fails in:formats:compileKotlin). Includes the Renovate commit plus the migration.What changed in binary-resources 32
I compared the class lists and
javapsignatures of the 31.13.2 and 32.5.2 jars from Google Maven:BinaryResourceFile→ResourceFile: samebyte[]constructor andgetChunks().BinaryResourceValue→ResourceValue: now AutoValue-based, with the sametype()/data()and an identicalTypeenum.BinaryResourceConfiguration/BinaryResourceIdentifier/BinaryResourceString→Resource*(diffuse doesn't use them).ArscBlamerandResourceEntryStatsCollectorwere removed (diffuse doesn't use them).TypeChunk,PackageChunkandResourceTableChunkaccessors diffuse uses are unchanged.Changes
BinaryResourceFile/BinaryResourceValuetoResourceFile/ResourceValue; there are no logic changes.java-targetis now 17 and the JDK test matrix is now 17, 21 and 25 (all supported LTS releases;testJdk11is gone). Without this, every APK path fails on JDK 11 withUnsupportedClassVersionError.ApkManifestTest, which tests the decoded binaryAndroidManifest.xml(package, versionName/versionCode and the full XML, including@type/namereference resolution throughresources.arsc) for the 5 fixture APKs. Before this, no golden covered the decoded manifest.Verification
Arscdumps (configs plus every entry id →type/name) for all 5 fixture APKs on 31.13.2 and 32.5.2; they are identical. The dump code is not committed../gradlew check(test + testJdk17/21/25 + lint) passes, and so does:diffuse:binaryDiffuseJar. The R8-minified binary reproducesstripe/info.txtandstripe/diff.txtbyte for byte.🤖 Generated with Claude Code