Skip to content

Migrate to binary-resources 32 (raises minimum Java to 17) - #623

Merged
mateuszkwiecinski merged 3 commits into
masterfrom
fix/apkparser-32
Nov 21, 2026
Merged

mateuszkwiecinski merged 3 commits into
masterfrom
fix/apkparser-32

Conversation

@mateuszkwiecinski

@mateuszkwiecinski mateuszkwiecinski commented Nov 21, 2026 •

Copy link
Copy Markdown
Member

Supersedes #525 (Renovate bump of com.android.tools.apkparser:binary-resources 31.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 javap signatures of the 31.13.2 and 32.5.2 jars from Google Maven:

  • BinaryResourceFile → ResourceFile: same byte[] constructor and getChunks().
  • BinaryResourceValue → ResourceValue: now AutoValue-based, with the same type()/data() and an identical Type enum.
  • BinaryResourceConfiguration/BinaryResourceIdentifier/BinaryResourceString → Resource* (diffuse doesn't use them).
  • ArscBlamer and ResourceEntryStatsCollector were removed (diffuse doesn't use them).
  • The XML chunk, TypeChunk, PackageChunk and ResourceTableChunk accessors diffuse uses are unchanged.
  • The jar is now compiled to Java 17 bytecode (class file 61). Its Guava references also resolve against the Guava 31.0.1 that diffuse pins.

Changes

  • Renamed BinaryResourceFile/BinaryResourceValue to ResourceFile/ResourceValue; there are no logic changes.
  • ⚠️ Raised the minimum runtime from Java 11 to Java 17: java-target is now 17 and the JDK test matrix is now 17, 21 and 25 (all supported LTS releases; testJdk11 is gone). Without this, every APK path fails on JDK 11 with UnsupportedClassVersionError.
  • Added ApkManifestTest, which tests the decoded binary AndroidManifest.xml (package, versionName/versionCode and the full XML, including @type/name reference resolution through resources.arsc) for the 5 fixture APKs. Before this, no golden covered the decoded manifest.

Verification

  • I generated the manifest goldens with 31.13.2, and they pass unchanged on 32.5.2.
  • I compared full Arsc dumps (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 reproduces stripe/info.txt and stripe/diff.txt byte for byte.

🤖 Generated with Claude Code

Copilot AI balanced review requested due to automatic review settings November 21, 2026 08:49

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

@mateuszkwiecinski
mateuszkwiecinski marked this pull request as ready for review November 21, 2026 08:55
@github-actions

github-actions Bot commented Nov 21, 2026 •

Copy link
Copy Markdown

Jar size:

Jar size change: +21.4KiB (3.5MiB -> 3.5MiB)

Diffuse output:

OLD: diffuse-source-file
NEW: diffuse-unspecified-r8.jar

       │          compressed           │        uncompressed         
       ├─────────┬─────────┬───────────┼─────────┬─────────┬─────────
 JAR   │ old     │ new     │ diff      │ old     │ new     │ diff    
───────┼─────────┼─────────┼───────────┼─────────┼─────────┼─────────
 class │ 1.8 MiB │ 1.8 MiB │ +21.1 KiB │ 3.2 MiB │ 3.2 MiB │ +31 KiB 
 other │ 1.7 MiB │ 1.7 MiB │       0 B │ 5.1 MiB │ 5.1 MiB │     0 B 
───────┼─────────┼─────────┼───────────┼─────────┼─────────┼─────────
 total │ 3.4 MiB │ 3.5 MiB │ +21.1 KiB │ 8.3 MiB │ 8.3 MiB │ +31 KiB 

 CLASSES │ old  │ new  │ diff            
─────────┼──────┼──────┼─────────────────
 classes │ 1352 │ 1372 │ +20 (+28 -8)    
 methods │ 7788 │ 7846 │ +58 (+108 -50)  
  fields │ 3319 │ 3379 │ +60 (+161 -101)
JAR
      compressed       │     uncompressed     │                                                                                                      
───────────┬───────────┼──────────┬───────────┤                                                                                                      
 size      │ diff      │ size     │ diff      │ path                                                                                                 
───────────┼───────────┼──────────┼───────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────
   5.6 KiB │  +5.6 KiB │ 10.4 KiB │ +10.4 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/ResourceConfiguration.class                               
           │  -5.5 KiB │          │ -10.1 KiB │ - com/google/devrel/gmscore/tools/apk/arsc/BinaryResourceConfiguration.class                         
   2.1 KiB │  +2.1 KiB │  3.5 KiB │  +3.5 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_ResourceConfiguration_Builder.class             
   1.9 KiB │  +1.9 KiB │  2.8 KiB │  +2.8 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_ResourceConfiguration.class                     
   1.9 KiB │  +1.9 KiB │  3.2 KiB │  +3.2 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/ResourceValue.class                                       
           │  -1.6 KiB │          │  -2.5 KiB │ - com/google/devrel/gmscore/tools/apk/arsc/BinaryResourceValue_Type.class                            
   1.6 KiB │  +1.6 KiB │  2.5 KiB │  +2.5 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/ResourceValue_Type.class                                  
   3.5 KiB │  +1.5 KiB │  6.5 KiB │    +3 KiB │ ∆ com/google/devrel/gmscore/tools/apk/arsc/TypeChunk.class                                           
   1.4 KiB │  +1.4 KiB │    2 KiB │    +2 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/ResourceString.class                                      
   1.4 KiB │  +1.4 KiB │  2.3 KiB │  +2.3 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_TypeChunk_Entry_Builder.class                   
   1.3 KiB │  +1.3 KiB │  2.1 KiB │  +2.1 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/ResourceConfiguration_Type.class                          
           │  -1.3 KiB │          │  -1.9 KiB │ - com/google/devrel/gmscore/tools/apk/arsc/BinaryResourceValue.class                                 
           │  -1.2 KiB │          │  -1.8 KiB │ - com/google/devrel/gmscore/tools/apk/arsc/XmlAttribute.class                                        
   1.2 KiB │  +1.2 KiB │  1.8 KiB │  +1.8 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_TypeChunk_Entry.class                           
   1.2 KiB │  +1.2 KiB │  1.7 KiB │  +1.7 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_XmlAttribute.class                              
           │  -1.2 KiB │          │  -1.7 KiB │ - com/google/devrel/gmscore/tools/apk/arsc/BinaryResourceConfiguration_Type.class                    
   1.1 KiB │  +1.1 KiB │  1.7 KiB │  +1.7 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_ResourceValue_Builder.class                     
   1.1 KiB │  +1.1 KiB │  1.7 KiB │  +1.7 KiB │ + com/google/common/collect/ImmutableEnumMap.class                                                   
           │    -997 B │          │  -1.3 KiB │ - com/google/devrel/gmscore/tools/apk/arsc/BinaryResourceString.class                                
     982 B │    +982 B │  1.2 KiB │  +1.2 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_LibraryChunk_Entry.class                        
     896 B │    +896 B │    1 KiB │    +1 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_StringPoolChunk_StringPoolSpan.class            
     849 B │    +849 B │  1.1 KiB │  +1.1 KiB │ + com/google/common/collect/Iterables.class                                                          
     843 B │    +843 B │    882 B │    +882 B │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_StringPoolChunk_StringPoolStyle.class           
     833 B │    +833 B │    1 KiB │    +1 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/AutoValue_ResourceValue.class                             
           │    -833 B │          │    -1 KiB │ - com/google/devrel/gmscore/tools/apk/arsc/BinaryResourceFile.class                                  
     821 B │    +821 B │    1 KiB │    +1 KiB │ + com/google/devrel/gmscore/tools/apk/arsc/ResourceFile.class                                        

...✂
CLASSES
CLASSES:

   old  │ new  │ diff         
  ──────┼──────┼──────────────
   1352 │ 1372 │ +20 (+28 -8) 
  
  + com.android.apksig.ApkVerifier_2
  + com.google.common.collect.ImmutableEnumMap
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap_1EntrySetImpl
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap
  + com.google.common.collect.Iterables
  + com.google.common.collect.Iterators_1
  + com.google.common.collect.Maps_7
  + com.google.common.collect.Maps_8
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_LibraryChunk_Entry
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_ResourceConfiguration_Builder
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_ResourceConfiguration
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_ResourceValue_Builder
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_ResourceValue
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_StringPoolChunk_StringPoolSpan
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_StringPoolChunk_StringPoolStyle
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_TypeChunk_Entry_Builder
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_TypeChunk_Entry
  + com.google.devrel.gmscore.tools.apk.arsc.AutoValue_XmlAttribute
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceConfiguration_Builder
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceConfiguration_Type
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceConfiguration
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceFile
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceString_Type
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceString
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceValue_Builder
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceValue_Type
  + com.google.devrel.gmscore.tools.apk.arsc.ResourceValue
  + com.google.devrel.gmscore.tools.apk.arsc.TypeChunk_Entry_Builder
  
  - com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceConfiguration_Type
  - com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceConfiguration
  - com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceFile
  - com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceString_Type
  - com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceString
  - com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceValue_Type
  - com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceValue
  - com.google.devrel.gmscore.tools.apk.arsc.XmlAttribute
  

METHODS:

   old  │ new  │ diff           
  ──────┼──────┼────────────────
   7788 │ 7846 │ +58 (+108 -50) 
  
  + com.android.apksig.ApkVerifier_2 m(int, HashMap, String, int, String)
  + com.google.common.collect.AbstractMapEntry setValue(Object) → Object
  + com.google.common.collect.ImmutableEnumMap <init>(EnumMap)
  + com.google.common.collect.ImmutableEnumMap containsKey(Object) → boolean
  + com.google.common.collect.ImmutableEnumMap equals(Object) → boolean
  + com.google.common.collect.ImmutableEnumMap forEach(BiConsumer)
  + com.google.common.collect.ImmutableEnumMap get(Object) → Object
  + com.google.common.collect.ImmutableEnumMap keyIterator() → UnmodifiableIterator
  + com.google.common.collect.ImmutableEnumMap keySpliterator() → Spliterator
  + com.google.common.collect.ImmutableEnumMap size() → int
  + com.google.common.collect.ImmutableMap copyOf(HashMap) → ImmutableMap
  + com.google.common.collect.ImmutableMap keyIterator() → UnmodifiableIterator
  + com.google.common.collect.ImmutableMap keySet() → ImmutableSet
  + com.google.common.collect.ImmutableMap keySpliterator() → Spliterator
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap <init>()
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap createEntrySet() → ImmutableSet
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap createKeySet() → ImmutableSet
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap createValues() → ImmutableCollection
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap entrySet() → Set
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap keySet() → Set
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap values() → Collection
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap_1EntrySetImpl <init>(ImmutableMap_IteratorBasedImmutableMap)
  + com.google.common.collect.ImmutableMap_IteratorBasedImmutableMap_1EntrySetImpl iterator() → UnmodifiableIterator
  + co
...✂

renovate Bot and others added 3 commits November 21, 2026 09:56
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>
Copilot AI balanced review requested due to automatic review settings November 21, 2026 08:57

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

@github-actions

Copy link
Copy Markdown

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

@mateuszkwiecinski
mateuszkwiecinski merged commit 0e81024 into master Nov 21, 2026
2 checks passed
@mateuszkwiecinski
mateuszkwiecinski deleted the fix/apkparser-32 branch November 21, 2026 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants