fastlane-plugin-bundletool 1.0.11 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2656e2f3d17ab99447189a43f7337906d1f84eeb4418ad25ec2f9203564764a
-  data.tar.gz: b2ee465e8168baa2926a119059157747a51e12b9334e1c87ab116b713f96d200
+  metadata.gz: 86168114efe411a2131c772024c4bdecc2390f59b16718fba36d5ecf377c17ac
+  data.tar.gz: d4a85823a3cad1f35a443440e33467e9bc85cbe1126e987200550681b927a888
 SHA512:
-  metadata.gz: d2680c1e5c950a3b222c6de916ca7b9cba00cb963814fa09e3c8bfd5854708a440f7d83e73345f082ab6394f7f9a2a131750149571aa8d2101ce5fb1abe4069f
-  data.tar.gz: 446ec9ecd3775d0c8f94b9287facba2e999b6b3471eeb61ecf230f8b248b25aa45b640cfb8f3db4ad6afa0cd78ebaca5ca868463b42ced328bd928e793f9595a
+  metadata.gz: 284a3920bb14be5e26d51d132571cc993b2ee7576d3ddc08e2f490a70dc555b61cea0926f6ce244bbabf18eec34663200be25bdfa017e05ad414a17991206a87
+  data.tar.gz: 2067707f374e46626374787a95432e8a352a31701a53bb7cb3815325a404b3ef6c4148f61091d3f9d0f4de1d45a8f79ba2ff85c7f186fe4d8565a13e99298891

data/README.md

@@ -22,7 +22,7 @@ gem 'fastlane-plugin-bundletool'
 
 https://developer.android.com/studio/command-line/bundletool
 
-The motivation of this plugin is to extract an universal `.apk` file from an [.aab](https://fileinfo.com/extension/aab) file. Since we cannot distribute aab files, it's great that we can extract from the very same binary a file that we can distribute internally.
+The motivation of this plugin is to extract an universal `.apk` or split `.apks` from an [.aab](https://fileinfo.com/extension/aab) file. Since we cannot distribute aab files, it's great that we can extract from the very same binary a file that we can distribute internally.
 
 ## Usage
 
@@ -38,7 +38,8 @@ bundletool(
   aab_path: aab_path,
   apk_output_path: apk_output_path,
   verbose: true,
-  cache_path: cache_path
+  cache_path: cache_path,
+  universal_apk: true
 )
 ```
 
@@ -60,6 +61,7 @@ This will output the universal `.apk` in the output path you set.
 | apk_output_path       | Path where the apk file is going to be placed           | FL_BUNDLETOOL_APK_OUTPUT_PATH   | .       |
 | verbose               | Show every messages of the action                       | FL_BUNDLETOOL_VERBOSE           | false   |
 | cache_path            | Cache downloaded bundletool binary into the cache path  | FL_BUNDLETOOL_CACHE_PATH        |         |
+| universal_apk         | Create universal APK (true) or split APKs (false)       | FL_BUNDLETOOL_UNIVERSAL_APK     | true    |
 |-----------------------|---------------------------------------------------------|---------------------------------|---------|
 
 ## Use case

data/lib/fastlane/plugin/bundletool/actions/bundletool_action.rb

@@ -25,6 +25,7 @@ module Fastlane
         aab_path = params[:aab_path]
         output_path = params[:apk_output_path] || '.'
         cache_path = params[:cache_path]
+        universal_apk = params[:universal_apk]
 
         return unless validate_aab!(aab_path)
 
@@ -50,7 +51,7 @@ module Fastlane
 
         return unless download_bundletool(bundletool_version, download_url, bundletool_filename, installation_path)
 
-        extract_universal_apk_from(aab_path, output_path, keystore_info, bundletool_filename, installation_path)
+        extract_apk_from(aab_path, output_path, keystore_info, bundletool_filename, installation_path, universal_apk)
       end
 
       def self.validate_aab!(aab_path)
@@ -77,18 +78,18 @@ module Fastlane
         return false
       end      
 
-      def self.extract_universal_apk_from(aab_path, apk_output_path, keystore_info, bundletool_filename, installation_path)
+      def self.extract_apk_from(aab_path, apk_output_path, keystore_info, bundletool_filename, installation_path, universal_apk)
         aab_absolute_path = Pathname.new(File.expand_path(aab_path)).to_s
         apk_output_absolute_path = Pathname.new(File.expand_path(apk_output_path)).to_s
-        output_path = run_bundletool!(aab_absolute_path, keystore_info, bundletool_filename, installation_path)
-        prepare_apk!(output_path, apk_output_absolute_path)
+        output_path = run_bundletool!(aab_absolute_path, keystore_info, bundletool_filename, installation_path, universal_apk)
+        prepare_apk!(output_path, apk_output_absolute_path, universal_apk)
       rescue StandardError => e
         puts_error!("Bundletool could not extract universal apk from aab at #{aab_absolute_path}. \nError message\n #{e.message}")
       ensure
         clean_temp!
       end
 
-      def self.run_bundletool!(aab_path, keystore_info, bundletool_filename, installation_path)
+      def self.run_bundletool!(aab_path, keystore_info, bundletool_filename, installation_path, universal_apk)
         puts_message("Extracting apk from #{aab_path}...")
         output_path = "#{@bundletool_temp_path}/output.apks"
         keystore_params = ''
@@ -97,10 +98,12 @@ module Fastlane
           key_alias_password = Shellwords.shellescape("pass:#{keystore_info[:alias_password]}")
           key_store_password = Shellwords.shellescape("pass:#{keystore_info[:keystore_password]}")
           key_alias = Shellwords.shellescape(keystore_info[:alias])
-          keystore_params = "--ks=#{keystore_info[:keystore_path]} --ks-pass=#{key_store_password} --ks-key-alias=#{key_alias} --key-pass=#{key_alias_password}"
+          keystore_params = "--ks='#{keystore_info[:keystore_path]}' --ks-pass=#{key_store_password} --ks-key-alias=#{key_alias} --key-pass=#{key_alias_password}"
         end
 
-        cmd = "java -jar #{installation_path}/#{bundletool_filename} build-apks --bundle=\"#{aab_path}\" --output=\"#{output_path}\" --mode=universal #{keystore_params}"
+        universal_apk_param = universal_apk == true ? "--mode=universal" : ""
+
+        cmd = "java -jar #{installation_path}/#{bundletool_filename} build-apks --bundle=\"#{aab_path}\" --output=\"#{output_path}\" #{universal_apk_param} #{keystore_params}"
 
         Open3.popen3(cmd) do |_, _, stderr, wait_thr|
           exit_status = wait_thr.value
@@ -110,7 +113,7 @@ module Fastlane
         output_path
       end
 
-      def self.prepare_apk!(output_path, target_path)
+      def self.prepare_apk!(output_path, target_path, universal_apk)
         puts_message("Preparing apk to #{target_path}...")
         if File.file?(target_path)
           puts_important("Apk at path #{target_path} exists. Replacing it.")
@@ -121,9 +124,14 @@ module Fastlane
           FileUtils.mkdir_p target_dir_name
         end
 
-        cmd = "mv \"#{output_path}\" \"#{@bundletool_temp_path}/output.zip\" &&"\
-              "unzip \"#{@bundletool_temp_path}/output.zip\" -d \"#{@bundletool_temp_path}\" &&"\
-              "mv \"#{@bundletool_temp_path}/universal.apk\" \"#{target_path}\""
+        cmd = ''
+        if universal_apk == true
+          cmd = "mv \"#{output_path}\" \"#{@bundletool_temp_path}/output.zip\" &&"\
+          "unzip \"#{@bundletool_temp_path}/output.zip\" -d \"#{@bundletool_temp_path}\" &&"\
+          "mv \"#{@bundletool_temp_path}/universal.apk\" \"#{target_path}\""
+        else
+          cmd = "mv \"#{output_path}\" \"#{target_path}\""
+        end
 
         Open3.popen3(cmd) do |_, _, stderr, wait_thr|
           exit_status = wait_thr.value
@@ -220,7 +228,14 @@ module Fastlane
                                        env_name: 'FL_BUNDLETOOL_CACHE_PATH',
                                        description: 'Cache downloaded bundletool binary into the cache path specified',
                                        is_string: true,
-                                       optional: true)
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :universal_apk,
+                                       env_name: 'FL_BUNDLETOOL_UNIVERSAL_APK',
+                                       description: 'Create universal APK (true) or split APKs (false)',
+                                       is_string: false,
+                                       type: Boolean,
+                                       optional: true,
+                                       default_value: true)
         ]
       end
 

data/lib/fastlane/plugin/bundletool/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Bundletool
-    VERSION = "1.0.11"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-bundletool
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors:
 - Martin Gonzalez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -150,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
-description: 
+description:
 email: gonzalez.martin90@gmail.com
 executables: []
 extensions: []
@@ -167,7 +167,7 @@ homepage: https://github.com/MartinGonzalez/fastlane-plugin-bundletool
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Extracts a universal apk from an .aab file
 test_files: []