fastlane-plugin-bundletool 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3316b9eeacf70304f2e0f69d783ca9d05d2c2d1796506b3542405ccb52d4ecd5
-  data.tar.gz: 5cb733e217d21209ab8609c05fbf8f003494b211cf923c5b9acb29a7e7819fae
+  metadata.gz: 8a1ce147b19920327f7ca4a32519214316955aa906469ec9eb2edb5f249e9f72
+  data.tar.gz: abb7030269fda53b86f532da8a137a5fafc593c69be5fbb164f01157c5b5e36d
 SHA512:
-  metadata.gz: b7df6d358ed9595839f8639a9cc86590310a5fe7f8645e4f8cc6db926c30f60ce74ad27ab1df51ebd45872afc412ab1c579954bc0716b768204d4ee60906e22d
-  data.tar.gz: 9d493090e285ec55f947dc0bd172883f0414725b562a723283e0e14b5450d75e350c55ab23451e001dfcc4c295004e1bb5e4fd7042adcb7bce9ae6df3c223be7
+  metadata.gz: 0f6c1a75aa421ef5184da894a6ebdf2a15824698479b90927f86188d8953ddccaa55fcdd62276c18258a4f9beb6d9c4110335e69ecfc9711f693ac851f579d1d
+  data.tar.gz: eadcb068dd75527b1eb35ac1683c43e029d824a859202cff77d8a7de901b516b94243722e34f543cb8714822ae0a7ec9af5679efe6156d64be7f4bed759ba2c4

data/README.md

@@ -13,7 +13,7 @@ fastlane add_plugin bundletool
 or in your Pluginfile under fastlane folder write the following line and run `bundle install`.
 
 ```
-gem 'fastlane-plugin-bundletool', '1.0.4'
+gem 'fastlane-plugin-bundletool', '1.0.6'
 ```
 
 ## About bundletool
@@ -34,7 +34,7 @@ bundletool(
   ks_password: keystore_password,
   ks_key_alias: keystore_alias,
   ks_key_alias_password: keystore_alias_password,
-  bundletool_version: '0.11.0',
+  bundletool_version: '1.10.0', # For searching a specific version of bundletool visit https://github.com/google/bundletool/releases
   aab_path: aab_path,
   apk_output_path: apk_output_path,
   verbose: true

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

@@ -20,12 +20,13 @@ module Fastlane
         end
 
         bundletool_version = params[:bundletool_version]
+        download_url = params[:download_url]
         aab_path = params[:aab_path]
         output_path = params[:apk_output_path] || '.'
 
         return unless validate_aab!(aab_path)
 
-        return unless download_bundletool(bundletool_version)
+        return unless download_bundletool(bundletool_version, download_url)
 
         extract_universal_apk_from(aab_path, output_path, keystore_info)
       end
@@ -37,22 +38,27 @@ module Fastlane
           return false
         end
         puts_success('Checking if .aab file exists')
+        return true
       end
 
-      def self.download_bundletool(version)
-        puts_message("Downloading bundletool (#{version}) from https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar...")
-        Dir.mkdir "#{@project_root}/bundletool_temp"        
-        URI.open("https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar") do |bundletool|
-          File.open("#{@bundletool_temp_path}/bundletool.jar", 'wb') do |file|
-            file.write(bundletool.read)
-          end
+      def self.download_bundletool(version, download_url)
+        Dir.mkdir "#{@project_root}/bundletool_temp"
+
+        unless download_url.nil?          
+          puts "Downloading bundletool from #{download_url}"
+          puts_message("Downloading bundletool from #{download_url}")
+          download_and_write_bundletool(download_url)
+        else
+          puts_message("Downloading bundletool (#{version}) from https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar...")
+          download_and_write_bundletool("https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar")
         end
-        puts_success('Downloading bundletool')
+        puts_success('Downloaded bundletool')
+        true
       rescue OpenURI::HTTPError => e
         clean_temp!
-        puts_error!("Something went wrong when downloading bundletool version #{version}. \nError message\n #{e.message}")        
+        puts_error!("Something went wrong when downloading bundletool version #{version}" + ". \nError message\n #{e.message}")
         false
-      end
+      end      
 
       def self.extract_universal_apk_from(aab_path, apk_output_path, keystore_info)
         aab_absolute_path = Pathname.new(File.expand_path(aab_path)).to_s
@@ -155,15 +161,19 @@ module Fastlane
                                        description: 'Version of bundletool to use, by default 0.11.0 will be used',
                                        is_string: true,
                                        default_value: '0.11.0'),
+          FastlaneCore::ConfigItem.new(key: :download_url,
+                                       description: 'Url to download bundletool from, should point to a jar file',
+                                       is_string: true,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :aab_path,
                                        description: 'Path where the aab file is',
                                        is_string: true,
                                        optional: false,
                                        verify_block: proc do |value|
-                                                       unless value && !value.empty?
-                                                         UI.user_error!('You must set aab_path.')
-                                                       end
-                                                     end),
+                                         unless value && !value.empty?
+                                           UI.user_error!('You must set aab_path.')
+                                         end
+                                       end),
           FastlaneCore::ConfigItem.new(key: :apk_output_path,
                                        description: 'Path where the apk file is going to be placed',
                                        is_string: true,
@@ -201,6 +211,16 @@ module Fastlane
       def self.is_supported?(platform)
         [:android].include?(platform)
       end
+
+      private
+
+      def self.download_and_write_bundletool(download_url)
+        URI.open(download_url) do |bundletool|
+          File.open("#{@bundletool_temp_path}/bundletool.jar", 'wb') do |file|
+            file.write(bundletool.read)
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Bundletool
-    VERSION = "1.0.5"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-bundletool
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Martin Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Extracts a universal apk from an .aab file