fastlane_hotfix 2.165.0 → 2.187.0

data/fastlane/lib/fastlane/actions/git_commit.rb

@@ -2,16 +2,16 @@ module Fastlane
   module Actions
     class GitCommitAction < Action
       def self.run(params)
-        if params[:path].kind_of?(String)
-          paths = params[:path].shellescape
-        else
-          paths = params[:path].map(&:shellescape).join(' ')
-        end
+        paths = params[:path].map(&:shellescape).join(' ')
 
         skip_git_hooks = params[:skip_git_hooks] ? '--no-verify' : ''
 
         if params[:allow_nothing_to_commit]
-          repo_clean = Actions.sh("git status --porcelain").empty?
+          # Here we check if the path passed in parameter contains any modification
+          # and we skip the `git commit` command if there is none.
+          # That means you can have other files modified that are not in the path parameter
+          # and still make use of allow_nothing_to_commit.
+          repo_clean = Actions.sh("git status #{paths} --porcelain").empty?
           UI.success("Nothing to commit, working tree clean ✅.") if repo_clean
           return if repo_clean
         end
@@ -33,16 +33,18 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :path,
-                                       description: "The file you want to commit",
-                                       is_string: false),
+                                       description: "The file(s) or directory(ies) you want to commit. You can pass an array of multiple file-paths or fileglobs \"*.txt\" to commit all matching files. The files already staged but not specified and untracked files won't be committed",
+                                       type: Array),
           FastlaneCore::ConfigItem.new(key: :message,
                                        description: "The commit message that should be used"),
           FastlaneCore::ConfigItem.new(key: :skip_git_hooks,
-                                       description: "Set to true to pass --no-verify to git",
+                                       description: "Set to true to pass `--no-verify` to git",
+                                       default_value: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :allow_nothing_to_commit,
-                                       description: "Set to true to allow commit without any git changes",
+                                       description: "Set to true to allow commit without any git changes in the files you want to commit",
+                                       default_value: false,
                                        type: Boolean,
                                        optional: true)
         ]

data/fastlane/lib/fastlane/actions/git_pull.rb

@@ -23,20 +23,14 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :only_tags,
                                        description: "Simply pull the tags, and not bring new commits to the current branch from the remote",
-                                       is_string: false,
+                                       type: Boolean,
                                        optional: true,
-                                       default_value: false,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("Please pass a valid value for only_tags. Use one of the following: true, false") unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
-                                       end),
+                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :rebase,
                                        description: "Rebase on top of the remote branch instead of merge",
-                                       is_string: false,
+                                       type: Boolean,
                                        optional: true,
-                                       default_value: false,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("Please pass a valid value for rebase. Use one of the following: true, false") unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
-                                       end)
+                                       default_value: false)
         ]
       end
 

data/fastlane/lib/fastlane/actions/git_remote_branch.rb

@@ -0,0 +1,57 @@
+module Fastlane
+  module Actions
+    class GitRemoteBranchAction < Action
+      def self.run(params)
+        Actions.git_remote_branch_name(params[:remote_name])
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Returns the name of the current git remote default branch"
+      end
+
+      def self.details
+        "If no default remote branch could be found, this action will return nil. This is a wrapper for the internal action Actions.git_default_remote_branch_name"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :remote_name,
+                                       env_name: "FL_REMOTE_REPOSITORY_NAME",
+                                       description: "The remote repository to check",
+                                       optional: true)
+        ]
+      end
+
+      def self.output
+        []
+      end
+
+      def self.authors
+        ["SeanMcNeil"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+
+      def self.example_code
+        [
+          'git_remote_branch # Query git for first available remote name',
+          'git_remote_branch(remote_name:"upstream") # Provide a remote name'
+        ]
+      end
+
+      def self.return_type
+        :string
+      end
+
+      def self.category
+        :source_control
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/git_submodule_update.rb

@@ -13,20 +13,19 @@ module Fastlane
       #####################################################
 
       def self.description
-        "Executes a git submodule command"
+        "Executes a git submodule update command"
       end
 
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :recursive,
-           description: "Should the submodules be updated recursively",
-           type: Boolean,
-           default_value: false),
+                                       description: "Should the submodules be updated recursively?",
+                                       type: Boolean,
+                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :init,
-           description: "Should the submodules be initiated before update",
-           type: Boolean,
-           is_string: false,
-           default_value: false)
+                                       description: "Should the submodules be initiated before update?",
+                                       type: Boolean,
+                                       default_value: false)
         ]
       end
 
@@ -44,6 +43,15 @@ module Fastlane
         return true
       end
 
+      def self.example_code
+        [
+          'git_submodule_update',
+          'git_submodule_update(recursive: true)',
+          'git_submodule_update(init: true)',
+          'git_submodule_update(recursive: true, init: true)'
+        ]
+      end
+
       def self.category
         :source_control
       end

data/fastlane/lib/fastlane/actions/git_tag_exists.rb

@@ -45,6 +45,10 @@ module Fastlane
         "Boolean value whether the tag exists or not"
       end
 
+      def self.return_type
+        :bool
+      end
+
       def self.output
         [
         ]

data/fastlane/lib/fastlane/actions/github_api.rb

@@ -13,7 +13,7 @@ module Fastlane
 
           http_method = (params[:http_method] || 'GET').to_s.upcase
           url = construct_url(params[:server_url], params[:path], params[:url])
-          headers = construct_headers(params[:api_token], params[:headers])
+          headers = construct_headers(params[:api_token], params[:api_bearer], params[:headers])
           payload = construct_body(params[:body], params[:raw_body])
           error_handlers = params[:error_handlers] || {}
           secure = params[:secure]
@@ -89,12 +89,20 @@ module Fastlane
             FastlaneCore::ConfigItem.new(key: :api_token,
                                          env_name: "FL_GITHUB_API_TOKEN",
                                          description: "Personal API Token for GitHub - generate one at https://github.com/settings/tokens",
+                                         conflicting_options: [:api_bearer],
                                          sensitive: true,
                                          code_gen_sensitive: true,
-                                         is_string: true,
                                          default_value: ENV["GITHUB_API_TOKEN"],
                                          default_value_dynamic: true,
-                                         optional: false),
+                                         optional: true),
+            FastlaneCore::ConfigItem.new(key: :api_bearer,
+                                         env_name: "FL_GITHUB_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),
             FastlaneCore::ConfigItem.new(key: :http_method,
                                          env_name: "FL_GITHUB_API_HTTP_METHOD",
                                          description: "The HTTP method. e.g. GET / POST",
@@ -108,13 +116,12 @@ module Fastlane
             FastlaneCore::ConfigItem.new(key: :body,
                                          env_name: "FL_GITHUB_API_REQUEST_BODY",
                                          description: "The request body in JSON or hash format",
-                                         is_string: false,
+                                         skip_type_validation: true, # allow Hash, Array
                                          default_value: {},
                                          optional: true),
             FastlaneCore::ConfigItem.new(key: :raw_body,
                                          env_name: "FL_GITHUB_API_REQUEST_RAW_BODY",
                                          description: "The request body taken verbatim instead of as JSON, useful for file uploads",
-                                         is_string: true,
                                          optional: true),
             FastlaneCore::ConfigItem.new(key: :path,
                                          env_name: "FL_GITHUB_API_PATH",
@@ -129,12 +136,13 @@ module Fastlane
                                          end),
             FastlaneCore::ConfigItem.new(key: :error_handlers,
                                          description: "Optional error handling hash based on status code, or pass '*' to handle all errors",
-                                         is_string: false,
+                                         type: Hash,
                                          default_value: {},
                                          optional: true),
             FastlaneCore::ConfigItem.new(key: :headers,
+                                         env_name: "FL_GITHUB_API_HEADERS",
                                          description: "Optional headers to apply",
-                                         is_string: false,
+                                         type: Hash,
                                          default_value: {},
                                          optional: true),
             FastlaneCore::ConfigItem.new(key: :secure,
@@ -202,10 +210,11 @@ module Fastlane
 
         private
 
-        def construct_headers(api_token, overrides)
+        def construct_headers(api_token, api_bearer, overrides)
           require 'base64'
           headers = { 'User-Agent' => 'fastlane-github_api' }
           headers['Authorization'] = "Basic #{Base64.strict_encode64(api_token)}" if api_token
+          headers['Authorization'] = "Bearer #{api_bearer}" if api_bearer
           headers.merge(overrides || {})
         end
 

data/fastlane/lib/fastlane/actions/gradle.rb

@@ -68,7 +68,7 @@ module Fastlane
 
         apk_search_path = File.join(project_dir, '**', 'build', 'outputs', 'apk', '**', '*.apk')
         aab_search_path = File.join(project_dir, '**', 'build', 'outputs', 'bundle', '**', '*.aab')
-        output_json_search_path = File.join(project_dir, '**', 'build', 'outputs', 'apk', '**', 'output.json')
+        output_json_search_path = File.join(project_dir, '**', 'build', 'outputs', 'apk', '**', 'output*.json') # output.json in Android Stuido 3 and output-metadata.json in Android Studio 4
         mapping_txt_search_path = File.join(project_dir, '**', 'build', 'outputs', 'mapping', '**', 'mapping.txt')
 
         # Our apk/aab is now built, but there might actually be multiple ones that were built if a flavor was not specified in a multi-flavor project (e.g. `assembleRelease`)
@@ -146,64 +146,56 @@ module Fastlane
                                        env_name: 'FL_GRADLE_TASK',
                                        description: 'The gradle task you want to execute, e.g. `assemble`, `bundle` or `test`. For tasks such as `assembleMyFlavorRelease` you should use gradle(task: \'assemble\', flavor: \'Myflavor\', build_type: \'Release\')',
                                        conflicting_options: [:tasks],
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :flavor,
                                        env_name: 'FL_GRADLE_FLAVOR',
                                        description: 'The flavor that you want the task for, e.g. `MyFlavor`. If you are running the `assemble` task in a multi-flavor project, and you rely on Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] then you must specify a flavor here or else this value will be undefined',
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :build_type,
                                        env_name: 'FL_GRADLE_BUILD_TYPE',
                                        description: 'The build type that you want the task for, e.g. `Release`. Useful for some tasks such as `assemble`',
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :tasks,
                                        type: Array,
                                        env_name: 'FL_GRADLE_TASKS',
                                        description: 'The multiple gradle tasks that you want to execute, e.g. `[assembleDebug, bundleDebug]`',
                                        conflicting_options: [:task],
-                                       optional: true,
-                                       is_string: false),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :flags,
                                        env_name: 'FL_GRADLE_FLAGS',
                                        description: 'All parameter flags you want to pass to the gradle command, e.g. `--exitcode --xml file.xml`',
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :project_dir,
                                        env_name: 'FL_GRADLE_PROJECT_DIR',
                                        description: 'The root directory of the gradle project',
-                                       default_value: '.',
-                                       is_string: true),
+                                       default_value: '.'),
           FastlaneCore::ConfigItem.new(key: :gradle_path,
                                        env_name: 'FL_GRADLE_PATH',
                                        description: 'The path to your `gradlew`. If you specify a relative path, it is assumed to be relative to the `project_dir`',
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :properties,
                                        env_name: 'FL_GRADLE_PROPERTIES',
                                        description: 'Gradle properties to be exposed to the gradle script',
                                        optional: true,
-                                       is_string: false),
+                                       type: Hash),
           FastlaneCore::ConfigItem.new(key: :system_properties,
                                        env_name: 'FL_GRADLE_SYSTEM_PROPERTIES',
                                        description: 'Gradle system properties to be exposed to the gradle script',
                                        optional: true,
-                                       is_string: false),
+                                       type: Hash),
           FastlaneCore::ConfigItem.new(key: :serial,
                                        env_name: 'FL_ANDROID_SERIAL',
                                        description: 'Android serial, which device should be used for this command',
-                                       is_string: true,
                                        default_value: ''),
           FastlaneCore::ConfigItem.new(key: :print_command,
                                        env_name: 'FL_GRADLE_PRINT_COMMAND',
                                        description: 'Control whether the generated Gradle command is printed as output before running it (true/false)',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :print_command_output,
                                        env_name: 'FL_GRADLE_PRINT_COMMAND_OUTPUT',
                                        description: 'Control whether the output produced by given Gradle command is printed while running (true/false)',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true)
         ]
       end

data/fastlane/lib/fastlane/actions/hg_commit_version_bump.rb

@@ -127,7 +127,7 @@ module Fastlane
                                        description: "Forces the commit, even if other files than the ones containing the version number have been modified",
                                        optional: true,
                                        default_value: false,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :test_dirty_files,
                                        env_name: "FL_HG_COMMIT_TEST_DIRTY_FILES",
                                        description: "A list of dirty files passed in for testing",

data/fastlane/lib/fastlane/actions/hg_push.rb

@@ -27,7 +27,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_HG_PUSH_FORCE",
                                        description: "Force push to remote",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :destination,
                                        env_name: "FL_HG_PUSH_DESTINATION",

data/fastlane/lib/fastlane/actions/hipchat.rb

@@ -49,7 +49,8 @@ module Fastlane
           # Escape channel's name to guarantee it is a valid URL resource.
           # First of all we verify that the value is not already escaped,
           # escaping an escaped value will produce a wrong channel name.
-          escaped_channel = URI.unescape(channel) == channel ? URI.escape(channel) : channel
+          require 'addressable/uri'
+          escaped_channel = Addressable::URI.encode(channel) == channel ? Addressable::URI.encode(channel) : channel
           if user?(channel)
             params = { 'message' => message, 'message_format' => message_format }
             json_headers = { 'Content-Type' => 'application/json',
@@ -116,14 +117,13 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :custom_color,
                                        env_name: "FL_HIPCHAT_CUSTOM_COLOR",
                                        description: "Specify a custom color, this overrides the success boolean. Can be one of 'yellow', 'red', 'green', 'purple', 'gray', or 'random'",
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :success,
                                        env_name: "FL_HIPCHAT_SUCCESS",
                                        description: "Was this build successful? (true/false)",
                                        optional: true,
                                        default_value: true,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "HIPCHAT_API_VERSION",
                                        description: "Version of the Hipchat API. Must be 1 or 2",
@@ -138,7 +138,7 @@ module Fastlane
                                        description: "Should the people in the room be notified? (true/false)",
                                        default_value: false,
                                        optional: true,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :api_host,
                                        env_name: "HIPCHAT_API_HOST",
                                        description: "The host of the HipChat-Server API",
@@ -160,7 +160,7 @@ module Fastlane
                                        description: "Should html formatted messages include a preformatted header? (true/false)",
                                        default_value: true,
                                        optional: true,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :from,
                                        env_name: "FL_HIPCHAT_FROM",
                                        description: "Name the message will appear to be sent from",

data/fastlane/lib/fastlane/actions/hockey.rb

@@ -226,19 +226,13 @@ module Fastlane
                                        description: "Path to your symbols file. For iOS and Mac provide path to app.dSYM.zip. For Android provide path to mappings.txt file",
                                        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: :create_update,
                                        env_name: "FL_HOCKEY_CREATE_UPDATE",
                                        description: "Set true if you want to create then update your app as opposed to just upload it."\
                                          " You will need the 'public_identifier', 'bundle_version' and 'bundle_short_version'",
-                                       is_string: false,
-                                       default_value: false,
-                                       verify_block: proc do |value|
-                                         # validation is done in the action
-                                       end),
+                                       type: Boolean,
+                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :notes,
                                        env_name: "FL_HOCKEY_NOTES",
                                        description: "Beta Notes",
@@ -307,7 +301,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :upload_dsym_only,
                                       env_name: "FL_HOCKEY_UPLOAD_DSYM_ONLY",
                                       description: "Flag to upload only the dSYM file to hockey app",
-                                      is_string: false,
+                                      type: Boolean,
                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :owner_id,
                                       env_name: "FL_HOCKEY_OWNER_ID",
@@ -328,12 +322,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :bypass_cdn,
                                       env_name: "FL_HOCKEY_BYPASS_CDN",
                                       description: "Flag to bypass Hockey CDN when it uploads successfully but reports error",
-                                      is_string: false,
+                                      type: Boolean,
                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :dsa_signature,
                                       env_name: "FL_HOCKEY_DSA_SIGNATURE",
                                       description: "DSA signature for sparkle updates for macOS",
-                                      is_string: true,
                                       default_value: "",
                                       optional: true)
         ]