fastlane_hotfix 2.165.0 → 2.187.0

data/fastlane/lib/fastlane/actions/dsym_zip.rb

@@ -61,7 +61,7 @@ module Fastlane
                                        description: 'Whether or not all dSYM files are to be included. Optional, default is false in which only your app dSYM is included',
                                        default_value: false,
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        env_name: 'DSYM_ZIP_ALL')
         ]
       end

data/fastlane/lib/fastlane/actions/ensure_env_vars.rb

@@ -3,15 +3,11 @@ module Fastlane
     class EnsureEnvVarsAction < Action
       def self.run(params)
         variables = params[:env_vars]
+        missing_variables = variables.select { |variable| ENV[variable].to_s.strip.empty? }
 
-        variables.each do |variable|
-          next unless ENV[variable].to_s.strip.empty?
-
-          UI.user_error!("Missing environment variable '#{variable}'")
-        end
+        UI.user_error!("Missing environment variable(s) '#{missing_variables.join('\', \'')}'") unless missing_variables.empty?
 
         is_one = variables.length == 1
-
         UI.success("Environment variable#{is_one ? '' : 's'} '#{variables.join('\', \'')}' #{is_one ? 'is' : 'are'} set!")
       end
 

data/fastlane/lib/fastlane/actions/ensure_git_branch.rb

@@ -35,7 +35,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :branch,
                                        env_name: "FL_ENSURE_GIT_BRANCH_NAME",
                                        description: "The branch that should be checked for. String that can be either the full name of the branch or a regex e.g. `^feature\/.*$` to match",
-                                       is_string: true,
                                        default_value: 'master')
         ]
       end

data/fastlane/lib/fastlane/actions/ensure_git_status_clean.rb

@@ -65,18 +65,17 @@ module Fastlane
                                        description: "The flag whether to show uncommitted changes if the repo is dirty",
                                        optional: true,
                                        default_value: false,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :show_diff,
                                        env_name: "FL_ENSURE_GIT_STATUS_CLEAN_SHOW_DIFF",
                                        description: "The flag whether to show the git diff if the repo is dirty",
                                        optional: true,
                                        default_value: false,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :ignored,
                                        env_name: "FL_ENSURE_GIT_STATUS_CLEAN_IGNORED_FILE",
                                        description: "The flag whether to ignore file the git status if the repo is dirty",
-                                       optional: true,
-                                       is_string: true)
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/ensure_no_debug_code.rb

@@ -84,18 +84,16 @@ module Fastlane
                                        env_name: "FL_ENSURE_NO_DEBUG_CODE_EXTENSIONS",
                                        description: "An array of file extensions that should be searched for",
                                        optional: true,
-                                       is_string: false),
+                                       type: Array),
           FastlaneCore::ConfigItem.new(key: :exclude,
                                        env_name: "FL_ENSURE_NO_DEBUG_CODE_EXCLUDE",
                                        description: "Exclude a certain pattern from the search",
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :exclude_dirs,
                                        env_name: "FL_ENSURE_NO_DEBUG_CODE_EXCLUDE_DIRS",
                                        description: "An array of dirs that should not be included in the search",
                                        optional: true,
-                                       type: Array,
-                                       is_string: false)
+                                       type: Array)
         ]
       end
 

data/fastlane/lib/fastlane/actions/ensure_xcode_version.rb

@@ -85,7 +85,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "FL_ENSURE_XCODE_VERSION",
                                        description: "Xcode version to verify that is selected",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :strict,
                                        description: "Should the version be verified strictly (all 3 version numbers), or matching only the given version numbers (i.e. `11.3` == `11.3.x`)",
@@ -109,7 +108,7 @@ module Fastlane
 
       def self.example_code
         [
-          'ensure_xcode_version(version: "7.2")'
+          'ensure_xcode_version(version: "12.5")'
         ]
       end
 

data/fastlane/lib/fastlane/actions/environment_variable.rb

@@ -29,27 +29,19 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(
-            key: :set,
-            env_name: 'FL_ENVIRONMENT_VARIABLE_SET',
-            description: 'Set the environment variables named',
-            optional: true,
-            type: Hash
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :get,
-            env_name: 'FL_ENVIRONMENT_VARIABLE_GET',
-            description: 'Get the environment variable named',
-            optional: true,
-            is_string: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :remove,
-            env_name: 'FL_ENVIRONMENT_VARIABLE_REMOVE',
-            description: 'Remove the environment variable named',
-            optional: true,
-            is_string: true
-          )
+          FastlaneCore::ConfigItem.new(key: :set,
+                                       env_name: 'FL_ENVIRONMENT_VARIABLE_SET',
+                                       description: 'Set the environment variables named',
+                                       optional: true,
+                                       type: Hash),
+          FastlaneCore::ConfigItem.new(key: :get,
+                                       env_name: 'FL_ENVIRONMENT_VARIABLE_GET',
+                                       description: 'Get the environment variable named',
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :remove,
+                                       env_name: 'FL_ENVIRONMENT_VARIABLE_REMOVE',
+                                       description: 'Remove the environment variable named',
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/erb.rb

@@ -34,20 +34,17 @@ module Fastlane
                                        short_option: "-T",
                                        env_name: "FL_ERB_SRC",
                                        description: "ERB Template File",
-                                       optional: false,
-                                       is_string: true),
+                                       optional: false),
           FastlaneCore::ConfigItem.new(key: :destination,
                                        short_option: "-D",
                                        env_name: "FL_ERB_DST",
                                        description: "Destination file",
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :placeholders,
                                        short_option: "-p",
                                        env_name: "FL_ERB_PLACEHOLDERS",
                                        description: "Placeholders given as a hash",
                                        default_value: {},
-                                       is_string: false,
                                        type: Hash),
           FastlaneCore::ConfigItem.new(key: :trim_mode,
                                        short_option: "-t",

data/fastlane/lib/fastlane/actions/get_build_number_repository.rb

@@ -83,7 +83,7 @@ module Fastlane
                                        env_name: "USE_HG_REVISION_NUMBER",
                                        description: "Use hg revision number instead of hash (ignored for non-hg repos)",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false)
         ]
       end

data/fastlane/lib/fastlane/actions/get_certificates.rb

@@ -12,8 +12,12 @@ module Fastlane
         return if Helper.test?
 
         begin
+          # Only set :api_key from SharedValues if :api_key_path isn't set (conflicting options)
+          unless params[:api_key_path]
+            params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+          end
+
           Cert.config = params # we alread have the finished config
-          Cert.config[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
 
           Cert::Runner.new.launch
           cert_file_path = ENV["CER_FILE_PATH"]

data/fastlane/lib/fastlane/actions/get_github_release.rb

@@ -11,6 +11,7 @@ module Fastlane
         GithubApiAction.run(
           server_url: params[:server_url],
           api_token: params[:api_token],
+          api_bearer: params[:api_bearer],
           http_method: 'GET',
           path: "repos/#{params[:url]}/releases",
           error_handlers: {
@@ -133,7 +134,16 @@ module Fastlane
                                        default_value: ENV["GITHUB_API_TOKEN"],
                                        default_value_dynamic: true,
                                        description: "GitHub Personal Token (required for private repositories)",
-                                       optional: true)
+                                       conflicting_options: [:api_bearer],
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :api_bearer,
+                                       env_name: "FL_GITHUB_RELEASE_API_BEARER",
+                                       sensitive: true,
+                                       code_gen_sensitive: true,
+                                       description: "Use a Bearer authorization token. Usually generated by Github Apps, e.g. GitHub Actions GITHUB_TOKEN environment variable",
+                                       conflicting_options: [:api_token],
+                                       optional: true,
+                                       default_value: nil)
         ]
       end
 

data/fastlane/lib/fastlane/actions/get_ipa_info_plist_value.rb

@@ -40,7 +40,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        env_name: "FL_GET_IPA_INFO_PLIST_VALUE_IPA",
                                        description: "Path to IPA",
-                                       is_string: true,
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
                                        default_value_dynamic: true)
         ]

data/fastlane/lib/fastlane/actions/get_managed_play_store_publishing_rights.rb

@@ -26,7 +26,9 @@ module Fastlane
         # Login
         credentials = JSON.parse(json_key_data)
         callback_uri = 'https://fastlane.github.io/managed_google_play-callback/callback.html'
-        uri = "https://play.google.com/apps/publish/delegatePrivateApp?service_account=#{credentials['client_email']}&continueUrl=#{URI.encode_www_form_component(callback_uri)}"
+        require 'addressable/uri'
+        continueUrl = Addressable::URI.encode(callback_uri)
+        uri = "https://play.google.com/apps/publish/delegatePrivateApp?service_account=#{credentials['client_email']}&continueUrl=#{continueUrl}"
 
         UI.message("To obtain publishing rights for custom apps on Managed Play Store, open the following URL and log in:")
         UI.message("")
@@ -71,40 +73,35 @@ 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, # optional until it is possible specify either json_key OR json_key_data are 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, # optional until it is possible specify either json_key OR json_key_data are 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)
         ]
       end
 

data/fastlane/lib/fastlane/actions/get_provisioning_profile.rb

@@ -14,8 +14,12 @@ module Fastlane
         require 'sigh'
         require 'credentials_manager/appfile_config'
 
+        # 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
+
         Sigh.config = values # we already have the finished config
-        Sigh.config[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
 
         path = Sigh::Manager.start
 
@@ -68,6 +72,10 @@ module Fastlane
         "The UUID of the profile sigh just fetched/generated"
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.details
         "**Note**: It is recommended to use [match](https://docs.fastlane.tools/actions/match/) according to the [codesigning.guide](https://codesigning.guide) for generating and maintaining your provisioning profiles. Use _sigh_ directly only if you want full control over what's going on and know more about codesigning."
       end

data/fastlane/lib/fastlane/actions/get_push_certificate.rb

@@ -55,7 +55,7 @@ module Fastlane
         @options << FastlaneCore::ConfigItem.new(key: :new_profile,
                                      description: "Block that is called if there is a new profile",
                                      optional: true,
-                                     is_string: false)
+                                     type: :string_callback)
         @options
       end
 

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -8,14 +8,15 @@ module Fastlane
       require 'shellwords'
 
       def self.run(params)
-        folder = params[:xcodeproj] ? File.join(params[:xcodeproj], '..') : '.'
+        xcodeproj_path_or_dir = params[:xcodeproj] || '.'
+        xcodeproj_dir = File.extname(xcodeproj_path_or_dir) == ".xcodeproj" ? File.dirname(xcodeproj_path_or_dir) : xcodeproj_path_or_dir
         target_name = params[:target]
         configuration = params[:configuration]
 
         # Get version_number
-        project = get_project!(folder)
+        project = get_project!(xcodeproj_path_or_dir)
         target = get_target!(project, target_name)
-        plist_file = get_plist!(folder, target, configuration)
+        plist_file = get_plist!(xcodeproj_dir, target, configuration)
         version_number = get_version_number_from_plist!(plist_file)
 
         # Get from build settings (or project settings) if needed (ex: $(MARKETING_VERSION) is default in Xcode 11)
@@ -39,13 +40,18 @@ module Fastlane
         return version_number
       end
 
-      def self.get_project!(folder)
+      def self.get_project!(xcodeproj_path_or_dir)
         require 'xcodeproj'
-        project_path = Dir.glob("#{folder}/*.xcodeproj").first
-        if project_path
+        if File.extname(xcodeproj_path_or_dir) == ".xcodeproj"
+          project_path = xcodeproj_path_or_dir
+        else
+          project_path = Dir.glob("#{xcodeproj_path_or_dir}/*.xcodeproj").first
+        end
+
+        if project_path && File.exist?(project_path)
           return Xcodeproj::Project.open(project_path)
         else
-          UI.user_error!("Unable to find Xcode project in folder: #{folder}")
+          UI.user_error!("Unable to find Xcode project at #{project_path || xcodeproj_path_or_dir}")
         end
       end
 
@@ -147,11 +153,12 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :xcodeproj,
                              env_name: "FL_VERSION_NUMBER_PROJECT",
-                             description: "Path to the main Xcode project to read version number from, optional. By default will use the first Xcode project found within the project root directory",
+                             description: "Path to the Xcode project to read version number from, or its containing directory, optional. If ommitted, or if a directory is passed instead, it will use the first Xcode project found within the given directory, or the project root directory if none is passed",
                              optional: true,
                              verify_block: proc do |value|
-                               UI.user_error!("Please pass the path to the project, not the workspace") if value.end_with?(".xcworkspace")
-                               UI.user_error!("Could not find Xcode project at path '#{File.expand_path(value)}'") if !File.exist?(value) && !Helper.test?
+                               UI.user_error!("Please pass the path to the project or its containing directory, not the workspace path") if value.end_with?(".xcworkspace")
+                               UI.user_error!("Could not find file or directory at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                               UI.user_error!("Could not find Xcode project in directory at path '#{File.expand_path(value)}'") if File.extname(value) != ".xcodeproj" && Dir.glob("#{value}/*.xcodeproj").empty?
                              end),
           FastlaneCore::ConfigItem.new(key: :target,
                              env_name: "FL_VERSION_NUMBER_TARGET",

data/fastlane/lib/fastlane/actions/git_add.rb

@@ -8,13 +8,9 @@ module Fastlane
           paths = params[:pathspec]
           success_message = "Successfully added from \"#{paths}\" 💾."
         elsif params[:path]
-          if params[:path].kind_of?(String)
-            paths = shell_escape(params[:path], should_escape)
-          elsif params[:path].kind_of?(Array)
-            paths = params[:path].map do |p|
-              shell_escape(p, should_escape)
-            end.join(' ')
-          end
+          paths = params[:path].map do |p|
+            shell_escape(p, should_escape)
+          end.join(' ')
           success_message = "Successfully added \"#{paths}\" 💾."
         else
           paths = "."
@@ -43,18 +39,17 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :path,
                                        description: "The file(s) and path(s) you want to add",
-                                       is_string: false,
+                                       type: Array,
                                        conflicting_options: [:pathspec],
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :shell_escape,
                                        description: "Shell escapes paths (set to false if using wildcards or manually escaping spaces in :path)",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true,
                                        optional: true),
           # Deprecated
           FastlaneCore::ConfigItem.new(key: :pathspec,
                                        description: "The pathspec you want to add files from",
-                                       is_string: true,
                                        conflicting_options: [:path],
                                        optional: true,
                                        deprecated: "Use `--path` instead")

data/fastlane/lib/fastlane/actions/git_branch.rb

@@ -1,16 +1,10 @@
 module Fastlane
   module Actions
-    module SharedValues
-      GIT_BRANCH_ENV_VARS = %w(GIT_BRANCH BRANCH_NAME TRAVIS_BRANCH BITRISE_GIT_BRANCH CI_BUILD_REF_NAME CI_COMMIT_REF_NAME WERCKER_GIT_BRANCH BUILDKITE_BRANCH APPCENTER_BRANCH CIRCLE_BRANCH).reject do |branch|
-        # Removing because tests break on CircleCI
-        Helper.test? && branch == "CIRCLE_BRANCH"
-      end.freeze
-    end
-
     class GitBranchAction < Action
       def self.run(params)
-        env_name = SharedValues::GIT_BRANCH_ENV_VARS.find { |env_var| FastlaneCore::Env.truthy?(env_var) }
-        ENV.fetch(env_name.to_s) { `git symbolic-ref HEAD --short 2>/dev/null`.strip }
+        branch = Actions.git_branch || ""
+        return "" if branch == "HEAD" # Backwards compatibility with the original (and documented) implementation
+        branch
       end
 
       #####################################################
@@ -22,7 +16,7 @@ module Fastlane
       end
 
       def self.details
-        "If no branch could be found, this action will return an empty string"
+        "If no branch could be found, this action will return an empty string. This is a wrapper for the internal action Actions.git_branch"
       end
 
       def self.available_options