fastlane_hotfix 2.165.1 → 2.187.0

data/fastlane/lib/fastlane/actions/upload_symbols_to_crashlytics.rb

@@ -1,5 +1,3 @@
-require 'thread'
-
 module Fastlane
   module Actions
     class UploadSymbolsToCrashlyticsAction < Action
@@ -7,8 +5,10 @@ module Fastlane
         require 'tmpdir'
 
         find_binary_path(params)
-        find_gsp_path(params)
-        find_api_token(params)
+        unless params[:app_id]
+          find_gsp_path(params)
+          find_api_token(params)
+        end
 
         if !params[:app_id] && !params[:gsp_path] && !params[:api_token]
           UI.user_error!('Either Firebase Crashlytics App ID, path to GoogleService-Info.plist or legacy Fabric API key must be given.')
@@ -35,10 +35,11 @@ module Fastlane
           UI.message("Using #{max_worker_threads} threads for Crashlytics dSYM upload 🏎")
         end
 
-        dsym_paths.each do |current_path|
-          handle_dsym(params, current_path, max_worker_threads)
+        worker = FastlaneCore::QueueWorker.new(max_worker_threads) do |dsym_path|
+          handle_dsym(params, dsym_path, max_worker_threads)
         end
-
+        worker.batch_enqueue(dsym_paths)
+        worker.start
         UI.success("Successfully uploaded dSYM files to Crashlytics 💯")
       end
 

data/fastlane/lib/fastlane/actions/upload_symbols_to_sentry.rb

@@ -79,7 +79,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_host,
                                        env_name: "SENTRY_HOST",
                                        description: "API host url for Sentry",
-                                       is_string: true,
                                        default_value: "https://app.getsentry.com/api/0",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :api_key,
@@ -109,20 +108,14 @@ module Fastlane
                                        description: "Path to your symbols file. For iOS and Mac provide path to app.dSYM.zip",
                                        default_value: Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH],
                                        default_value_dynamic: true,
-                                       optional: true,
-                                       verify_block: proc do |value|
-                                         # validation is done in the action
-                                       end),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :dsym_paths,
                                        env_name: "SENTRY_DSYM_PATHS",
                                        description: "Path to an array of your symbols file. For iOS and Mac provide path to app.dSYM.zip",
                                        default_value: Actions.lane_context[SharedValues::DSYM_PATHS],
                                        default_value_dynamic: true,
-                                       is_string: false,
-                                       optional: true,
-                                       verify_block: proc do |value|
-                                         # validation is done in the action
-                                       end)
+                                       type: Array,
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/upload_to_app_store.rb

@@ -9,10 +9,14 @@ module Fastlane
 
         begin
           config.load_configuration_file("Deliverfile")
-          config[:screenshots_path] = Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH] if Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH]
-          config[:ipa] = Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] if Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
-          config[:pkg] = Actions.lane_context[SharedValues::PKG_OUTPUT_PATH] if Actions.lane_context[SharedValues::PKG_OUTPUT_PATH]
-          config[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+          config[:screenshots_path] ||= Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH] if Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH]
+          config[:ipa] ||= Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] if Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
+          config[:pkg] ||= Actions.lane_context[SharedValues::PKG_OUTPUT_PATH] if Actions.lane_context[SharedValues::PKG_OUTPUT_PATH]
+
+          # Only set :api_key from SharedValues if :api_key_path isn't set (conflicting options)
+          unless config[:api_key_path]
+            config[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+          end
 
           return config if Helper.test?
           Deliver::Runner.new(config).run

data/fastlane/lib/fastlane/actions/upload_to_testflight.rb

@@ -15,14 +15,19 @@ module Fastlane
           values[:ipa] = File.expand_path(values[:ipa]) if values[:ipa]
         end
 
-        if values[:api_key_path].nil?
+        # Only set :api_key from SharedValues if :api_key_path isn't set (conflicting options)
+        unless values[:api_key_path]
           values[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
         end
 
         return values if Helper.test?
 
         if distribute_only
-          Pilot::BuildManager.new.distribute(values) # we already have the finished config
+          build_manager = Pilot::BuildManager.new
+          build_manager.start(values, should_login: true)
+
+          build_manager.wait_for_build_processing_to_be_complete(false) unless values[:skip_waiting_for_build_processing]
+          build_manager.distribute(values) # we already have the finished config
         else
           Pilot::BuildManager.new.upload(values) # we already have the finished config
         end

data/fastlane/lib/fastlane/actions/validate_play_store_json_key.rb

@@ -42,53 +42,49 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(
-            key: :json_key,
-            env_name: "SUPPLY_JSON_KEY",
-            short_option: "-j",
-            conflicting_options: [:json_key_data],
-            optional: true, # this shouldn't be optional but is until I find out how json_key OR json_key_data can be required
-            description: "The path to a file containing service account JSON, used to authenticate with Google",
-            code_gen_sensitive: true,
-            default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_file),
-            default_value_dynamic: true,
-            verify_block: proc do |value|
-              UI.user_error!("Could not find service account json file at path '#{File.expand_path(value)}'") unless File.exist?(File.expand_path(value))
-              UI.user_error!("'#{value}' doesn't seem to be a JSON file") unless FastlaneCore::Helper.json_file?(File.expand_path(value))
-            end
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :json_key_data,
-            env_name: "SUPPLY_JSON_KEY_DATA",
-            short_option: "-c",
-            conflicting_options: [:json_key],
-            optional: true,
-            description: "The raw service account JSON data used to authenticate with Google",
-            code_gen_sensitive: true,
-            default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_data_raw),
-            default_value_dynamic: true,
-            verify_block: proc do |value|
-              begin
-                JSON.parse(value)
-              rescue JSON::ParserError
-                UI.user_error!("Could not parse service account json: JSON::ParseError")
-              end
-            end
-          ),
+          FastlaneCore::ConfigItem.new(key: :json_key,
+                                       env_name: "SUPPLY_JSON_KEY",
+                                       short_option: "-j",
+                                       conflicting_options: [:json_key_data],
+                                       optional: true,
+                                       description: "The path to a file containing service account JSON, used to authenticate with Google",
+                                       code_gen_sensitive: true,
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_file),
+                                       default_value_dynamic: true,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Could not find service account json file at path '#{File.expand_path(value)}'") unless File.exist?(File.expand_path(value))
+                                         UI.user_error!("'#{value}' doesn't seem to be a JSON file") unless FastlaneCore::Helper.json_file?(File.expand_path(value))
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :json_key_data,
+                                       env_name: "SUPPLY_JSON_KEY_DATA",
+                                       short_option: "-c",
+                                       conflicting_options: [:json_key],
+                                       optional: true,
+                                       description: "The raw service account JSON data used to authenticate with Google",
+                                       code_gen_sensitive: true,
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_data_raw),
+                                       default_value_dynamic: true,
+                                       verify_block: proc do |value|
+                                         begin
+                                           JSON.parse(value)
+                                         rescue JSON::ParserError
+                                           UI.user_error!("Could not parse service account json: JSON::ParseError")
+                                         end
+                                       end),
           # stuff
           FastlaneCore::ConfigItem.new(key: :root_url,
-            env_name: "SUPPLY_ROOT_URL",
-            description: "Root URL for the Google Play API. The provided URL will be used for API calls in place of https://www.googleapis.com/",
-            optional: true,
-            verify_block: proc do |value|
-              UI.user_error!("Could not parse URL '#{value}'") unless value =~ URI.regexp
-            end),
+                                       env_name: "SUPPLY_ROOT_URL",
+                                       description: "Root URL for the Google Play API. The provided URL will be used for API calls in place of https://www.googleapis.com/",
+                                       optional: true,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Could not parse URL '#{value}'") unless value =~ URI.regexp
+                                       end),
           FastlaneCore::ConfigItem.new(key: :timeout,
-            env_name: "SUPPLY_TIMEOUT",
-            optional: true,
-            description: "Timeout for read, open, and send (in seconds)",
-            type: Integer,
-            default_value: 300)
+                                       env_name: "SUPPLY_TIMEOUT",
+                                       optional: true,
+                                       description: "Timeout for read, open, and send (in seconds)",
+                                       type: Integer,
+                                       default_value: 300)
         ]
       end
 

data/fastlane/lib/fastlane/actions/version_get_podspec.rb

@@ -28,7 +28,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "FL_VERSION_PODSPEC_PATH",
                                        description: "You must specify the path to the podspec file",
-                                       is_string: true,
                                        code_gen_sensitive: true,
                                        default_value: Dir["*.podspec"].last,
                                        default_value_dynamic: true,
@@ -38,7 +37,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :require_variable_prefix,
                                        env_name: "FL_VERSION_BUMP_PODSPEC_VERSION_REQUIRE_VARIABLE_PREFIX",
                                        description: "true by default, this is used for non CocoaPods version bumps only",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true)
         ]
       end

data/fastlane/lib/fastlane/actions/xcode_install.rb

@@ -17,7 +17,7 @@ module Fastlane
         if installer.installed?(params[:version])
           UI.success("Xcode #{params[:version]} is already installed ✨")
         else
-          installer.install_version(params[:version], true, true, true, true)
+          installer.install_version(params[:version], true, true, true, true, nil, true, nil, params[:download_retry_attempts])
         end
 
         xcode = installer.installed_versions.find { |x| x.version == params[:version] }
@@ -49,9 +49,7 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "FL_XCODE_VERSION",
-                                       description: "The version number of the version of Xcode to install",
-                                       verify_block: proc do |value|
-                                       end),
+                                       description: "The version number of the version of Xcode to install"),
           FastlaneCore::ConfigItem.new(key: :username,
                                        short_option: "-u",
                                        env_name: "XCODE_INSTALL_USER",
@@ -65,7 +63,12 @@ module Fastlane
                                        optional: true,
                                        code_gen_sensitive: true,
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_id),
-                                       default_value_dynamic: true)
+                                       default_value_dynamic: true),
+          FastlaneCore::ConfigItem.new(key: :download_retry_attempts,
+                                       env_name: "XCODE_INSTALL_DOWNLOAD_RETRY_ATTEMPTS",
+                                       description: "Number of times the download will be retried in case of failure",
+                                       type: Integer,
+                                       default_value: 3)
         ]
       end
 

data/fastlane/lib/fastlane/actions/xcode_server_get_assets.rb

@@ -243,7 +243,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :integration_number,
                                        env_name: "FL_XCODE_SERVER_GET_ASSETS_INTEGRATION_NUMBER",
                                        description: "Optionally you can override which integration's assets should be downloaded. If not provided, the latest integration is used",
-                                       is_string: false,
+                                       type: Integer,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :username,
                                        env_name: "FL_XCODE_SERVER_GET_ASSETS_USERNAME",
@@ -265,13 +265,13 @@ module Fastlane
                                        env_name: "FL_XCODE_SERVER_GET_ASSETS_KEEP_ALL_ASSETS",
                                        description: "Whether to keep all assets or let the script delete everything except for the .xcarchive",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :trust_self_signed_certs,
                                        env_name: "FL_XCODE_SERVER_GET_ASSETS_TRUST_SELF_SIGNED_CERTS",
                                        description: "Whether to trust self-signed certs on your Xcode Server",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true)
         ]
       end

data/fastlane/lib/fastlane/actions/xcodebuild.rb

@@ -305,12 +305,12 @@ module Fastlane
 
           # Normalize some values
           export_options[:teamID] = CredentialsManager::AppfileConfig.try_fetch_value(:team_id) if !export_options[:teamID] && CredentialsManager::AppfileConfig.try_fetch_value(:team_id)
-          export_options[:onDemandResourcesAssetPacksBaseURL] = URI.escape(export_options[:onDemandResourcesAssetPacksBaseURL]) if export_options[:onDemandResourcesAssetPacksBaseURL]
+          export_options[:onDemandResourcesAssetPacksBaseURL] = Addressable::URI.encode(export_options[:onDemandResourcesAssetPacksBaseURL]) if export_options[:onDemandResourcesAssetPacksBaseURL]
           if export_options[:manifest]
-            export_options[:manifest][:appURL] = URI.encode_www_form_component(export_options[:manifest][:appURL]) if export_options[:manifest][:appURL]
-            export_options[:manifest][:displayImageURL] = URI.encode_www_form_component(export_options[:manifest][:displayImageURL]) if export_options[:manifest][:displayImageURL]
-            export_options[:manifest][:fullSizeImageURL] = URI.encode_www_form_component(export_options[:manifest][:fullSizeImageURL]) if export_options[:manifest][:fullSizeImageURL]
-            export_options[:manifest][:assetPackManifestURL] = URI.encode_www_form_component(export_options[:manifest][:assetPackManifestURL]) if export_options[:manifest][:assetPackManifestURL]
+            export_options[:manifest][:appURL] = Addressable::URI.encode(export_options[:manifest][:appURL]) if export_options[:manifest][:appURL]
+            export_options[:manifest][:displayImageURL] = Addressable::URI.encode(export_options[:manifest][:displayImageURL]) if export_options[:manifest][:displayImageURL]
+            export_options[:manifest][:fullSizeImageURL] = Addressable::URI.encode(export_options[:manifest][:fullSizeImageURL]) if export_options[:manifest][:fullSizeImageURL]
+            export_options[:manifest][:assetPackManifestURL] = Addressable::URI.encode(export_options[:manifest][:assetPackManifestURL]) if export_options[:manifest][:assetPackManifestURL]
           end
 
           # Saves options to plist

data/fastlane/lib/fastlane/cli_tools_distributor.rb

@@ -23,7 +23,7 @@ module Fastlane
       def take_off
         before_import_time = Time.now
 
-        if !ENV["FASTLANE_DISABLE_ANIMATION"]
+        if ENV["FASTLANE_DISABLE_ANIMATION"].nil?
           # Usually in the fastlane code base we use
           #
           #   Helper.show_loading_indicator
@@ -71,6 +71,9 @@ module Fastlane
         # Disabling colors if environment variable set
         require 'fastlane_core/ui/disable_colors' if FastlaneCore::Helper.colors_disabled?
 
+        # Set interactive environment variable for spaceship (which can't require fastlane_core)
+        ENV["FASTLANE_IS_INTERACTIVE"] = FastlaneCore::UI.interactive?.to_s
+
         ARGV.unshift("spaceship") if ARGV.first == "spaceauth"
         tool_name = ARGV.first ? ARGV.first.downcase : nil
 
@@ -123,9 +126,9 @@ module Fastlane
       end
 
       # Since loading dotenv should respect additional environments passed using
-      # --env, we must extrat the arguments out of ARGV and process them before
+      # --env, we must extract the arguments out of ARGV and process them before
       # calling into commander. This is required since the ENV must be configured
-      # before running any other commands in order to correclty respect variables
+      # before running any other commands in order to correctly respect variables
       # like FASTLANE_HIDE_CHANGELOG and FASTLANE_DISABLE_COLORS
       def load_dot_env
         env_cl_param = lambda do

data/fastlane/lib/fastlane/commands_generator.rb

@@ -1,5 +1,6 @@
 require 'commander'
 require 'fastlane/new_action'
+require 'fastlane_core/ui/help_formatter'
 
 HighLine.track_eof = false
 
@@ -85,7 +86,7 @@ module Fastlane
       program :help, 'Author', 'Felix Krause <fastlane@krausefx.com>'
       program :help, 'Website', 'https://fastlane.tools'
       program :help, 'GitHub', 'https://github.com/fastlane/fastlane'
-      program :help_formatter, :compact
+      program :help_formatter, FastlaneCore::HelpFormatter
 
       global_option('--verbose') { FastlaneCore::Globals.verbose = true }
       global_option('--capture_output', 'Captures the output of the current run, and generates a markdown issue template') do

data/fastlane/lib/fastlane/documentation/actions_list.rb

@@ -135,7 +135,7 @@ module Fastlane
       if options
         puts(Terminal::Table.new(
                title: "#{name} Options".green,
-               headings: ['Key', 'Description', 'Env Var', 'Default'],
+               headings: ['Key', 'Description', 'Env Var(s)', 'Default'],
                rows: FastlaneCore::PrintTable.transform_output(options)
         ))
       else
@@ -197,7 +197,7 @@ module Fastlane
       if options.kind_of?(Array)
         options.each do |current|
           if current.kind_of?(FastlaneCore::ConfigItem)
-            rows << [current.key.to_s.yellow, current.deprecated ? current.description.red : current.description, current.env_name, current.help_default_value]
+            rows << [current.key.to_s.yellow, current.deprecated ? current.description.red : current.description, current.env_names.join(", "), current.help_default_value]
           elsif current.kind_of?(Array)
             # Legacy actions that don't use the new config manager
             UI.user_error!("Invalid number of elements in this row: #{current}. Must be 2 or 3") unless [2, 3].include?(current.count)

data/fastlane/lib/fastlane/documentation/docs_generator.rb

@@ -44,7 +44,7 @@ module Fastlane
         output << ""
       end
 
-      output << "This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run."
+      output << "This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run."
       output << "More information about fastlane can be found on [fastlane.tools](https://fastlane.tools)."
       output << "The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools)."
       output << ""

data/fastlane/lib/fastlane/documentation/markdown_docs_generator.rb

@@ -175,7 +175,7 @@ module Fastlane
       mkdocs_yml_path = File.join(target_path, "mkdocs.yml")
       raise "Could not find mkdocs.yml in #{target_path}, make sure to point to the fastlane/docs repo" unless File.exist?(mkdocs_yml_path)
       mkdocs_yml = YAML.load_file(mkdocs_yml_path)
-      hidden_actions_array = mkdocs_yml["pages"].find { |p| !p["_Actions"].nil? }
+      hidden_actions_array = mkdocs_yml["nav"].find { |p| !p["_Actions"].nil? }
       hidden_actions_array["_Actions"] = all_actions_ref_yml
       File.write(mkdocs_yml_path, mkdocs_yml.to_yaml)
 

data/fastlane/lib/fastlane/environment_printer.rb

@@ -229,6 +229,7 @@ module Fastlane
           UI.error(ex)
           UI.error("Could not get Xcode Version")
         end
+        table_content["Swift Version"] = Helper.swift_version || "N/A"
       end
 
       table = ["| Key | Value |"]

data/fastlane/lib/fastlane/erb_template_helper.rb

@@ -24,7 +24,13 @@ module Fastlane
     end
 
     def render(template)
-      ERB.new(template, nil, @trim_mode).result(binding)
+      # From Ruby 2.6, ERB.new takes keyword arguments and positional ones are deprecated
+      # https://bugs.ruby-lang.org/issues/14256
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
+        ERB.new(template, trim_mode: @trim_mode).result(binding)
+      else
+        ERB.new(template, nil, @trim_mode).result(binding)
+      end
     end
   end
 end

data/fastlane/lib/fastlane/fast_file.rb

@@ -201,13 +201,17 @@ module Fastlane
       # First accepts hash (or named keywords) like other actions
       # Otherwise uses sh method that doesn't have an interface like an action
       if args.count == 1 && args.first.kind_of?(Hash)
-        hash = args.first
-        command = hash.delete(:command)
+        options = args.first
+        command = options.delete(:command)
 
         raise ArgumentError, "sh requires :command keyword in argument" if command.nil?
-
-        new_args = [*command, hash]
-        FastFile.sh(*new_args, &b)
+        log = options[:log].nil? ? true : options[:log]
+        FastFile.sh(*command, step_name: options[:step_name], log: log, error_callback: options[:error_callback], &b)
+      elsif args.count != 1 && args.last.kind_of?(Hash)
+        new_args = args.dup
+        options = new_args.pop
+        log = options[:log].nil? ? true : options[:log]
+        FastFile.sh(*new_args, step_name: options[:step_name], log: log, error_callback: options[:error_callback], &b)
       else
         FastFile.sh(*args, &b)
       end
@@ -280,7 +284,7 @@ module Fastlane
 
         action_launched('import_from_git')
 
-        is_eligible_for_caching = !version.nil? && !cache_path.nil?
+        is_eligible_for_caching = !cache_path.nil?
 
         UI.message("Eligible for caching") if is_eligible_for_caching
 
@@ -334,7 +338,15 @@ module Fastlane
             UI.user_error!("No tag found matching #{version.inspect}") if checkout_param.nil?
           end
 
-          Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{checkout_path}")
+          if is_eligible_for_caching && version.nil?
+            # Update the repo if it's eligible for caching but the version isn't specified
+            UI.message("Fetching remote git branches and updating git repo...")
+            Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
+              Actions.sh("cd #{clone_folder.shellescape} && git fetch --all --quiet && git checkout #{checkout_param.shellescape} #{checkout_path} && git reset --hard && git rebase")
+            end
+          else
+            Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{checkout_path}")
+          end
 
           # Knowing that we check out all the files and directories when the
           # current call is eligible for caching, we don't need to also