app-info 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdaf1f27e2e99bcb2f956e47cec30e4b24f22222e592e253a1a35329ae09ddb1
-  data.tar.gz: deee5130996188ef10b5d61277b434b4abfcec1739f519332576610e6ab9f3ef
+  metadata.gz: eaf82a6d1506255b1273449d8780190beb43d82000a8307a8bdb2f7d26db9b5f
+  data.tar.gz: bd2a591c4586eec718b991a7a8ee9c51b42311da1c5b7d6c8c9ff47df017d6e8
 SHA512:
-  metadata.gz: a4a25969b08c4badb8120341af2596f3bf5e0ef9170298e182ef8536ad14d843bf8469019ce3cd2753b5c4c5b8ba215b5ea1eb85b1b8922309788637e83d62e6
-  data.tar.gz: 126e88b55bcb3bfa091d96993a1dd18f919dd75f4e77b3927313b26b587892e1eae7317f54ad22c0ad54ffefc6efdb3f142b525b0708497a2a818fd4b4e4be64
+  metadata.gz: f386060b89ea25bea1b1e41d2d8e355143f109304206e57a130d4ea93769085787c712a6f0ae8dddbc8b06cb82c63802af707b6cd04f0342b98effe557e31e22
+  data.tar.gz: 9181a83795f635f2c88f52889a9b7399cbfa62979ae7f2dabff23d2fb877287de24952d0c2fe53e41651e9c4f0ff01a5b1f7a5f6e0324b2e57684814e438d057

data/.github/workflows/ci.yml

@@ -12,11 +12,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ ruby-2.5, ruby-2.6, ruby-2.7, ruby-3.0 ]
+        ruby: [ ruby-2.5, ruby-2.6, ruby-2.7, ruby-3.0, ruby-3.1, ruby-3.2 ]
         os: [ ubuntu-latest ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -30,11 +30,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
           bundler-cache: true
 
       - name: bundle exec rubocop

data/.github/workflows/create_release.yml

@@ -0,0 +1,15 @@
+name: Create Release
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  create:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Create Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: CHANGELOG.md

data/CHANGELOG.md

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 > List all changes before release a new version.
 
+## [2.8.4] (2023-03-09)
+
+### Fixed
+
+- Sync the latest appt2 proto files to parse Android SDK 31+ for aab parser. [#51](https://github.com/icyleaf/app_info/issues/51) (thanks @[UpBra](https://github.com/UpBra))
+- Force android device return as boolean for aab parser.
+- Handle string resources referencing other resources for apk parser.
+
 ## [2.8.3] (2022-06-27)
 
 ### Fixed
@@ -234,7 +242,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Updated dependency of CFPropertly list be a range between 2.3.4. (thanks @[cschroed](https://github.com/cschroed))
 
-[Unreleased]: https://github.com/icyleaf/app-info/compare/v2.8.3..HEAD
+[Unreleased]: https://github.com/icyleaf/app-info/compare/v2.8.4..HEAD
+[2.8.4]: https://github.com/icyleaf/app-info/compare/v2.8.3...v2.8.4
 [2.8.3]: https://github.com/icyleaf/app-info/compare/v2.8.2...v2.8.3
 [2.8.2]: https://github.com/icyleaf/app-info/compare/v2.8.1...v2.8.2
 [2.8.1]: https://github.com/icyleaf/app-info/compare/v2.8.0...v2.8.1

data/README.md

@@ -1,7 +1,7 @@
 # app_info
 
 [![Language](https://img.shields.io/badge/ruby-2.5+-701516.svg)](.github/workflows/ci.yml)
-[![Build Status](https://img.shields.io/github/workflow/status/icyleaf/app_info/CI)](https://github.com/icyleaf/app_info/actions/workflows/ci.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/icyleaf/app_info/ci.yml)](https://github.com/icyleaf/app_info/actions/workflows/ci.yml)
 [![Gem version](https://img.shields.io/gem/v/app-info.svg?style=flat)](https://rubygems.org/gems/app_info)
 [![License](https://img.shields.io/badge/license-MIT-red.svg?style=flat)](LICENSE)
 
@@ -12,12 +12,14 @@ Teardown tool for mobile app (ipa, apk and aab file), macOS app and dSYM.zip fil
 - Android file
   - `.apk`
   - `.aab` (Androld App Bundle)
-- iOS ipa file
+- iOS file
+  - `.ipa`
   - `Info.plist` file
   - `.mobileprovision`/`.provisionprofile` file
 - Zipped macOS App file
+  - `.app.zip`
 - Zipped dSYMs file
-
+  - `.dSYM.zip`
 ## Installation
 
 Add this line to your application's Gemfile:

data/app_info.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5'
 
   spec.add_dependency 'CFPropertyList', '< 3.1.0', '>= 2.3.4'
-  spec.add_dependency 'image_size', '>= 1.5', '< 3.1'
+  spec.add_dependency 'image_size', '>= 1.5', '< 3.3'
   spec.add_dependency 'ruby-macho', '>= 1.4', '< 4'
-  spec.add_dependency 'android_parser', '~> 2.5.0'
+  spec.add_dependency 'android_parser', '~> 2.5.1'
   spec.add_dependency 'rubyzip', '>= 1.2', '< 3.0'
   spec.add_dependency 'uuidtools', '>= 2.1.5', '< 2.3.0'
   spec.add_dependency 'icns', '~> 0.2.0'
-  spec.add_dependency 'google-protobuf', '>= 3.19.4', '< 3.22.0'
+  spec.add_dependency 'google-protobuf', '>= 3.19.4', '< 3.23.0'
 
   spec.add_development_dependency 'bundler', '>= 1.12'
   spec.add_development_dependency 'rake', '>= 10.0'

data/lib/app_info/aab.rb

@@ -79,15 +79,15 @@ module AppInfo
     # end
 
     def wear?
-      use_features&.include?('android.hardware.type.watch')
+      !!use_features&.include?('android.hardware.type.watch')
     end
 
     def tv?
-      use_features&.include?('android.software.leanback')
+      !!use_features&.include?('android.software.leanback')
     end
 
     def automotive?
-      use_features&.include?('android.hardware.type.automotive')
+      !!use_features&.include?('android.hardware.type.automotive')
     end
 
     def min_sdk_version

data/lib/app_info/helper.rb

@@ -85,9 +85,7 @@ module AppInfo
       def tempdir(file, prefix:)
         dest_path ||= File.join(File.dirname(file), prefix)
         dest_file = File.join(dest_path, File.basename(file))
-
-        Dir.mkdir(dest_path, 0_700) unless Dir.exist?(dest_path)
-
+        FileUtils.mkdir_p(dest_path, mode: 0_700)
         dest_file
       end
     end

data/lib/app_info/png_uncrush.rb

@@ -44,7 +44,7 @@ module AppInfo
       end
 
       def png?
-        PNG_HEADER == header.bytes
+        header.bytes == PNG_HEADER
       end
 
       def [](offset, length)

data/lib/app_info/protobuf/models/README.md

@@ -3,7 +3,7 @@
 ## Convert to ruby model
 
 ```bash
-cd app_info/lib/app_info/abb/proto
+cd lib/app_info/protobuf/models
 
 protoc --ruby_out=. Resources.proto
 protoc --ruby_out=. Configuration.proto

data/lib/app_info/protobuf/models/Resources.proto

@@ -132,6 +132,11 @@ message Visibility {
 
   // The comment associated with the <public> tag.
   string comment = 3;
+
+  // Indicates that the resource id may change across builds and that the public R.java identifier
+  // for this resource should not be final. This is set to `true` for resources in `staging-group`
+  // tags.
+  bool staged_api = 4;
 }
 
 // Whether a resource comes from a compile-time overlay and is explicitly allowed to not overlay an
@@ -185,6 +190,12 @@ message OverlayableItem {
   uint32 overlayable_idx = 4;
 }
 
+// The staged resource ID definition of a finalized resource.
+message StagedId {
+  Source source = 1;
+  uint32 staged_id = 2;
+}
+
 // An entry ID in the range [0x0000, 0xffff].
 message EntryId {
   uint32 id = 1;
@@ -217,6 +228,9 @@ message Entry {
   // The set of values defined for this entry, each corresponding to a different
   // configuration/variant.
   repeated ConfigValue config_value = 6;
+
+  // The staged resource ID of this finalized resource.
+  StagedId staged_id = 7;
 }
 
 // A Configuration/Value pair.
@@ -268,6 +282,7 @@ message CompoundValue {
     Styleable styleable = 3;
     Array array = 4;
     Plural plural = 5;
+    MacroBody macro = 6;
   }
 }
 
@@ -299,6 +314,13 @@ message Reference {
 
   // Whether this reference is dynamic.
   Boolean is_dynamic = 5;
+
+  // The type flags used when compiling the reference. Used for substituting the contents of macros.
+  uint32 type_flags = 6;
+
+  // Whether raw string values would have been accepted in place of this reference definition. Used
+  // for substituting the contents of macros.
+  bool allow_raw = 7;
 }
 
 // A value that represents an ID. This is just a placeholder, as ID values are used to occupy a
@@ -586,3 +608,32 @@ message XmlAttribute {
   // The optional interpreted/compiled version of the `value` string.
   Item compiled_item = 6;
 }
+
+message MacroBody {
+  string raw_string = 1;
+  StyleString style_string = 2;
+  repeated UntranslatableSection untranslatable_sections = 3;
+  repeated NamespaceAlias namespace_stack = 4;
+  SourcePosition source = 5;
+}
+
+message NamespaceAlias {
+  string prefix = 1;
+  string package_name = 2;
+  bool is_private = 3;
+}
+
+message StyleString {
+  message Span {
+    string name = 1;
+    uint32 start_index = 2;
+    uint32 end_index = 3;
+  }
+  string str = 1;
+  repeated Span spans = 2;
+}
+
+message UntranslatableSection {
+  uint64 start_index = 1;
+  uint64 end_index = 2;
+}

data/lib/app_info/protobuf/models/Resources_pb.rb

@@ -47,6 +47,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :level, :enum, 1, "aapt.pb.Visibility.Level"
       optional :source, :message, 2, "aapt.pb.Source"
       optional :comment, :string, 3
+      optional :staged_api, :bool, 4
     end
     add_enum "aapt.pb.Visibility.Level" do
       value :UNKNOWN, 0
@@ -80,6 +81,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :ACTOR, 8
       value :CONFIG_SIGNATURE, 9
     end
+    add_message "aapt.pb.StagedId" do
+      optional :source, :message, 1, "aapt.pb.Source"
+      optional :staged_id, :uint32, 2
+    end
     add_message "aapt.pb.EntryId" do
       optional :id, :uint32, 1
     end
@@ -90,6 +95,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :allow_new, :message, 4, "aapt.pb.AllowNew"
       optional :overlayable_item, :message, 5, "aapt.pb.OverlayableItem"
       repeated :config_value, :message, 6, "aapt.pb.ConfigValue"
+      optional :staged_id, :message, 7, "aapt.pb.StagedId"
     end
     add_message "aapt.pb.ConfigValue" do
       optional :config, :message, 1, "aapt.pb.Configuration"
@@ -122,6 +128,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
         optional :styleable, :message, 3, "aapt.pb.Styleable"
         optional :array, :message, 4, "aapt.pb.Array"
         optional :plural, :message, 5, "aapt.pb.Plural"
+        optional :macro, :message, 6, "aapt.pb.MacroBody"
       end
     end
     add_message "aapt.pb.Boolean" do
@@ -133,6 +140,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :name, :string, 3
       optional :private, :bool, 4
       optional :is_dynamic, :message, 5, "aapt.pb.Boolean"
+      optional :type_flags, :uint32, 6
+      optional :allow_raw, :bool, 7
     end
     add_enum "aapt.pb.Reference.Type" do
       value :REFERENCE, 0
@@ -285,6 +294,31 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :resource_id, :uint32, 5
       optional :compiled_item, :message, 6, "aapt.pb.Item"
     end
+    add_message "aapt.pb.MacroBody" do
+      optional :raw_string, :string, 1
+      optional :style_string, :message, 2, "aapt.pb.StyleString"
+      repeated :untranslatable_sections, :message, 3, "aapt.pb.UntranslatableSection"
+      repeated :namespace_stack, :message, 4, "aapt.pb.NamespaceAlias"
+      optional :source, :message, 5, "aapt.pb.SourcePosition"
+    end
+    add_message "aapt.pb.NamespaceAlias" do
+      optional :prefix, :string, 1
+      optional :package_name, :string, 2
+      optional :is_private, :bool, 3
+    end
+    add_message "aapt.pb.StyleString" do
+      optional :str, :string, 1
+      repeated :spans, :message, 2, "aapt.pb.StyleString.Span"
+    end
+    add_message "aapt.pb.StyleString.Span" do
+      optional :name, :string, 1
+      optional :start_index, :uint32, 2
+      optional :end_index, :uint32, 3
+    end
+    add_message "aapt.pb.UntranslatableSection" do
+      optional :start_index, :uint64, 1
+      optional :end_index, :uint64, 2
+    end
   end
 end
 
@@ -305,6 +339,7 @@ module Aapt
     Overlayable = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.Overlayable").msgclass
     OverlayableItem = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.OverlayableItem").msgclass
     OverlayableItem::Policy = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.OverlayableItem.Policy").enummodule
+    StagedId = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.StagedId").msgclass
     EntryId = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.EntryId").msgclass
     Entry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.Entry").msgclass
     ConfigValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.ConfigValue").msgclass
@@ -340,5 +375,10 @@ module Aapt
     XmlElement = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.XmlElement").msgclass
     XmlNamespace = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.XmlNamespace").msgclass
     XmlAttribute = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.XmlAttribute").msgclass
+    MacroBody = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.MacroBody").msgclass
+    NamespaceAlias = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.NamespaceAlias").msgclass
+    StyleString = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.StyleString").msgclass
+    StyleString::Span = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.StyleString.Span").msgclass
+    UntranslatableSection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.UntranslatableSection").msgclass
   end
 end

data/lib/app_info/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppInfo
-  VERSION = '2.8.3'
+  VERSION = '2.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-info
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -39,7 +39,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: ruby-macho
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
         version: 3.19.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.22.0
+        version: 3.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
         version: 3.19.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.22.0
+        version: 3.23.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +225,7 @@ extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/create_release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -282,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Teardown tool for mobile app(ipa/apk) and dSYM file, analysis metedata like