fastlane 2.185.0 → 2.188.0

data/fastlane/lib/fastlane/actions/update_keychain_access_groups.rb

@@ -56,10 +56,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :identifiers,
                                        env_name: "FL_UPDATE_KEYCHAIN_ACCESS_GROUPS_IDENTIFIERS",
                                        description: "An Array of unique identifiers for the keychain access groups. Eg. ['your.keychain.access.groups.identifiers']",
-                                       is_string: false,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("The parameter identifiers need to be an Array.") unless value.kind_of?(Array)
-                                       end)
+                                       type: Array)
         ]
       end
 

data/fastlane/lib/fastlane/actions/update_plist.rb

@@ -50,7 +50,7 @@ module Fastlane
                                        description: "Path to plist file",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :block,
-                                       is_string: false,
+                                       type: :string_callback,
                                        description: 'A block to process plist with custom logic')
 
         ]

data/fastlane/lib/fastlane/actions/update_project_provisioning.rb

@@ -117,7 +117,7 @@ module Fastlane
                                        env_name: "FL_PROJECT_PROVISIONING_PROFILE_TARGET_FILTER",
                                        description: "A filter for the target name. Use a standard regex",
                                        optional: true,
-                                       is_string: false,
+                                       skip_type_validation: true, # allow Regexp, String
                                        verify_block: proc do |value|
                                          UI.user_error!("target_filter should be Regexp or String") unless [Regexp, String].any? { |type| value.kind_of?(type) }
                                        end),
@@ -129,7 +129,7 @@ module Fastlane
                                        env_name: "FL_PROJECT_PROVISIONING_PROFILE_BUILD_CONFIGURATION",
                                        description: "A filter for the build configuration name. Use a standard regex. Applied to all configurations if not specified",
                                        optional: true,
-                                       is_string: false,
+                                       skip_type_validation: true, # allow Regexp, String
                                        verify_block: proc do |value|
                                          UI.user_error!("build_configuration should be Regexp or String") unless [Regexp, String].any? { |type| value.kind_of?(type) }
                                        end),

data/fastlane/lib/fastlane/actions/update_urban_airship_configuration.rb

@@ -58,7 +58,6 @@ module Fastlane
                                        description: "The production app secret"),
           FastlaneCore::ConfigItem.new(key: :detect_provisioning_mode,
                                        env_name: "URBAN_AIRSHIP_DETECT_PROVISIONING_MODE",
-                                       is_string: false,
                                        type: Boolean,
                                        optional: true,
                                        description: "Automatically detect provisioning mode")

data/fastlane/lib/fastlane/actions/update_url_schemes.rb

@@ -51,33 +51,22 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(
-            key: :path,
-            env_name: 'FL_UPDATE_URL_SCHEMES_PATH',
-            description: 'The Plist file\'s path',
-            is_string: true,
-            optional: false,
-            verify_block: proc do |path|
-              UI.user_error!("Could not find plist at path '#{path}'") unless File.exist?(path)
-            end
-          ),
-
-          FastlaneCore::ConfigItem.new(
-            key: :url_schemes,
-            env_name: "FL_UPDATE_URL_SCHEMES_SCHEMES",
-            description: 'The new URL schemes',
-            is_string: false,
-            optional: true,
-            verify_block: proc do |url_schemes|
-              string = "The URL schemes must be an array of strings, got '#{url_schemes}'."
-              verify_schemes!(url_schemes, string)
-            end
-          ),
-
+          FastlaneCore::ConfigItem.new(key: :path,
+                                       env_name: 'FL_UPDATE_URL_SCHEMES_PATH',
+                                       description: 'The Plist file\'s path',
+                                       optional: false,
+                                       verify_block: proc do |path|
+                                         UI.user_error!("Could not find plist at path '#{path}'") unless File.exist?(path)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :url_schemes,
+                                       env_name: "FL_UPDATE_URL_SCHEMES_SCHEMES",
+                                       description: 'The new URL schemes',
+                                       type: Array,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :update_url_schemes,
-            description: "Block that is called to update schemes with current schemes passed in as parameter",
-            optional: true,
-            is_string: false)
+                                       description: "Block that is called to update schemes with current schemes passed in as parameter",
+                                       optional: true,
+                                       type: :string_callback)
         ]
       end
 

data/fastlane/lib/fastlane/actions/upload_app_privacy_details_to_app_store.rb

@@ -205,7 +205,7 @@ module Fastlane
                                        env_name: "FASTLANE_ITC_TEAM_ID",
                                        description: "The ID of your App Store Connect team if you're in multiple teams",
                                        optional: true,
-                                       is_string: false, # as we also allow integers, which we convert to strings anyway
+                                       skip_type_validation: true, # as we also allow integers, which we convert to strings anyway
                                        code_gen_sensitive: true,
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id),
                                        default_value_dynamic: true),
@@ -221,7 +221,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :json_path,
                                        env_name: "UPLOAD_APP_PRIVACY_DETAILS_TO_APP_STORE_JSON_PATH",
                                        description: "Path to the app usage data JSON",
-                                       is_string: true,
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Could not find JSON file at path '#{File.expand_path(value)}'") unless File.exist?(value)

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/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_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/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/helper/crashlytics_helper.rb

@@ -47,9 +47,9 @@ module Fastlane
           command << params[:api_token]
           command << params[:build_secret]
           command << "-ipaPath '#{params[:ipa_path]}'"
-          command << "-emails '#{params[:emails]}'" if params[:emails]
+          command << "-emails '#{params[:emails].join(',')}'" if params[:emails]
           command << "-notesPath '#{params[:notes_path]}'" if params[:notes_path]
-          command << "-groupAliases '#{params[:groups]}'" if params[:groups]
+          command << "-groupAliases '#{params[:groups].join(',')}'" if params[:groups]
           command << "-notifications #{(params[:notifications] ? 'YES' : 'NO')}"
           command << "-debug #{(params[:debug] ? 'YES' : 'NO')}"
 
@@ -74,9 +74,9 @@ module Fastlane
           command << "-androidManifest #{File.expand_path(android_manifest_path).shellescape}"
 
           # Optional
-          command << "-betaDistributionEmails #{params[:emails].shellescape}" if params[:emails]
+          command << "-betaDistributionEmails #{params[:emails].join(',').shellescape}" if params[:emails]
           command << "-betaDistributionReleaseNotesFilePath #{File.expand_path(params[:notes_path]).shellescape}" if params[:notes_path]
-          command << "-betaDistributionGroupAliases #{params[:groups].shellescape}" if params[:groups]
+          command << "-betaDistributionGroupAliases #{params[:groups].join(',').shellescape}" if params[:groups]
           command << "-betaDistributionNotifications #{(params[:notifications] ? 'true' : 'false')}"
 
           return command

data/fastlane/lib/fastlane/helper/git_helper.rb

@@ -131,12 +131,24 @@ module Fastlane
     # Returns the checked out git branch name or "HEAD" if you're in detached HEAD state
     def self.git_branch_name_using_HEAD
       # Rescues if not a git repo or no commits in a git repo
-      begin
-        Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
-      rescue => err
-        UI.verbose("Error getting git branch: #{err.message}")
-        nil
+      Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
+    rescue => err
+      UI.verbose("Error getting git branch: #{err.message}")
+      nil
+    end
+
+    # Returns the default git remote branch name
+    def self.git_remote_branch_name(remote_name)
+      # Rescues if not a git repo or no remote repo
+      if remote_name
+        Actions.sh("git remote show #{remote_name} | grep 'HEAD branch' | sed 's/.*: //'", log: false).chomp
+      else
+        # Query git for the current remote head
+        Actions.sh("variable=$(git remote) && git remote show $variable | grep 'HEAD branch' | sed 's/.*: //'", log: false).chomp
       end
+    rescue => err
+      UI.verbose("Error getting git default remote branch: #{err.message}")
+      nil
     end
 
     private_class_method

data/fastlane/lib/fastlane/plugins/template/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.4.2
+       - image: circleci/ruby:2.5
 
     working_directory: ~/repo
 

data/fastlane/lib/fastlane/plugins/template/.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.4
+        ruby-version: 2.5
     - name: Install dependencies
       run: bundle check || bundle install --jobs=4 --retry=3 --path vendor/bundle
     - name: Run tests

data/fastlane/lib/fastlane/setup/setup_ios.rb

@@ -147,9 +147,9 @@ module Fastlane
                 increment_build_number_if_applicable,
                 "\tbuildApp(#{project_prefix}scheme: \"#{self.scheme}\")"]
         if include_metadata
-          lane << "\tuploadToAppStore(username: \"#{self.user}\", app: \"#{self.app_identifier}\")"
+          lane << "\tuploadToAppStore(username: \"#{self.user}\", appIdentifier: \"#{self.app_identifier}\")"
         else
-          lane << "\tuploadToAppStore(username: \"#{self.user}\", app: \"#{self.app_identifier}\", skipScreenshots: true, skipMetadata: true)"
+          lane << "\tuploadToAppStore(username: \"#{self.user}\", appIdentifier: \"#{self.app_identifier}\", skipScreenshots: true, skipMetadata: true)"
         end
         lane << "}"
       else
@@ -219,7 +219,7 @@ module Fastlane
                 "\tcaptureScreenshots(#{project_prefix}scheme: \"#{ui_testing_scheme}\")"]
 
         if automatic_upload
-          lane << "\tuploadToAppStore(username: \"#{self.user}\", app: \"#{self.app_identifier}\", skipBinaryUpload: true, skipMetadata: true)"
+          lane << "\tuploadToAppStore(username: \"#{self.user}\", appIdentifier: \"#{self.app_identifier}\", skipBinaryUpload: true, skipMetadata: true)"
         end
         lane << "}"
       else

data/fastlane/lib/fastlane/swift_fastlane_function.rb

@@ -31,7 +31,7 @@ module Fastlane
 
       # rubocop:disable Layout/LineLength
       # class instance?
-      @reserved_words = %w[associativity break case catch class continue convenience default deinit didSet do else enum extension fallthrough false final for func guard if in infix init inout internal lazy let mutating nil operator override precedence private public repeat required return self static struct subscript super switch throws true try var weak where while willSet].to_set
+      @reserved_words = %w[actor associativity async await break case catch class continue convenience default deinit didSet do else enum extension fallthrough false final for func guard if in infix init inout internal lazy let mutating nil operator override precedence private public repeat required return self static struct subscript super switch throws true try var weak where while willSet].to_set
       # rubocop:enable Layout/LineLength
     end
 
@@ -195,7 +195,7 @@ module Fastlane
         else
           if type == "((String) -> Void)?"
             "#{param}: #{type} = nil"
-          elsif optional && type.end_with?('?') && !type.start_with?('Any')
+          elsif optional && type.end_with?('?') && !type.start_with?('Any') || type.start_with?('Bool')
             "#{param}: OptionalConfigValue<#{type}> = .fastlaneDefault(#{default_value})"
           else
             "#{param}: #{type} = #{default_value}"
@@ -286,7 +286,7 @@ module Fastlane
         sanitized_name = sanitize_reserved_word(word: sanitized_name)
         type_string = type_override == :string_callback ? ".stringClosure" : "nil"
 
-        if !(type_override == :string_callback || !(is_optional && default_value.nil? && !type.start_with?('Any')))
+        if !(type_override == :string_callback || !(is_optional && default_value.nil? && !type.start_with?('Any') || type.start_with?('Bool')))
           { name: "#{sanitized_name.gsub('`', '')}Arg", arg: "let #{sanitized_name.gsub('`', '')}Arg = #{sanitized_name}.asRubyArgument(name: \"#{name}\", type: #{type_string})" }
         else
           { name: "#{sanitized_name.gsub('`', '')}Arg", arg: "let #{sanitized_name.gsub('`', '')}Arg = RubyCommand.Argument(name: \"#{name}\", value: #{sanitized_name}, type: #{type_string})" }
@@ -434,7 +434,7 @@ module Fastlane
 
         if type == "((String) -> Void)?"
           "#{param}: #{type} = nil"
-        elsif optional && type.end_with?('?') && !type.start_with?('Any')
+        elsif (optional && type.end_with?('?') && !type.start_with?('Any')) || type.start_with?('Bool')
           "#{param}: OptionalConfigValue<#{type}> = .fastlaneDefault(#{self.class_name.downcase}.#{static_var_for_parameter_name})"
         else
           "#{param}: #{type} = #{self.class_name.downcase}.#{static_var_for_parameter_name}"

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.185.0'.freeze
+  VERSION = '2.188.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '1.12.1'.freeze