fastlane_hotfix 2.165.1 → 2.187.0

data/fastlane/lib/fastlane/actions/reset_git_repo.rb

@@ -81,30 +81,27 @@ module Fastlane
                                        env_name: "FL_RESET_GIT_FILES",
                                        description: "Array of files the changes should be discarded. If not given, all files will be discarded",
                                        optional: true,
-                                       is_string: false,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("Please pass an array only") unless value.kind_of?(Array)
-                                       end),
+                                       type: Array),
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_RESET_GIT_FORCE",
                                        description: "Skip verifying of previously clean state of repo. Only recommended in combination with `files` option",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :skip_clean,
                                        env_name: "FL_RESET_GIT_SKIP_CLEAN",
                                        description: "Skip 'git clean' to avoid removing untracked files like `.env`",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :disregard_gitignore,
                                        env_name: "FL_RESET_GIT_DISREGARD_GITIGNORE",
                                        description: "Setting this to true will clean the whole repository, ignoring anything in your local .gitignore. Set this to true if you want the equivalent of a fresh clone, and for all untracked and ignore files to also be removed",
-                                       is_string: false,
+                                       type: Boolean,
                                        optional: true,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :exclude,
                                        env_name: "FL_RESET_GIT_EXCLUDE",
                                        description: "You can pass a string, or array of, file pattern(s) here which you want to have survive the cleaning process, and remain on disk, e.g. to leave the `artifacts` directory you would specify `exclude: 'artifacts'`. Make sure this pattern is also in your gitignore! See the gitignore documentation for info on patterns",
-                                       is_string: false,
+                                       skip_type_validation: true, # allows String, Array, Regex
                                        optional: true)
         ]
       end

data/fastlane/lib/fastlane/actions/reset_simulator_contents.rb

@@ -44,14 +44,12 @@ module Fastlane
                                        short_option: "-i",
                                        env_name: "FASTLANE_RESET_SIMULATOR_VERSIONS",
                                        description: "Which OS versions of Simulators you want to reset content and settings, this does not remove/recreate the simulators",
-                                       is_string: false,
                                        optional: true,
                                        type: Array),
           FastlaneCore::ConfigItem.new(key: :os_versions,
                                        short_option: "-v",
                                        env_name: "FASTLANE_RESET_SIMULATOR_OS_VERSIONS",
                                        description: "Which OS versions of Simulators you want to reset content and settings, this does not remove/recreate the simulators",
-                                       is_string: false,
                                        optional: true,
                                        type: Array)
         ]

data/fastlane/lib/fastlane/actions/resign.rb

@@ -60,14 +60,13 @@ module Fastlane
                                        env_name: "FL_RESIGN_ENTITLEMENTS",
                                        description: "Path to the entitlement file to use, e.g. `myApp/MyApp.entitlements`",
                                        conflicting_options: [:use_app_entitlements],
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :provisioning_profile,
                                        env_name: "FL_RESIGN_PROVISIONING_PROFILE",
                                        description: "Path to your provisioning_profile. Optional if you use _sigh_",
                                        default_value: Actions.lane_context[SharedValues::SIGH_PROFILE_PATH],
                                        default_value_dynamic: true,
-                                       is_string: false,
+                                       skip_type_validation: true, # allows Hash, Array
                                        verify_block: proc do |value|
                                          files = case value
                                                  when Hash then value.values
@@ -82,40 +81,34 @@ module Fastlane
                                        env_name: "FL_RESIGN_VERSION",
                                        description: "Version number to force resigned ipa to use. Updates both `CFBundleShortVersionString` and `CFBundleVersion` values in `Info.plist`. Applies for main app and all nested apps or extensions",
                                        conflicting_options: [:short_version, :bundle_version],
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :display_name,
                                        env_name: "FL_DISPLAY_NAME",
                                        description: "Display name to force resigned ipa to use",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :short_version,
                                        env_name: "FL_RESIGN_SHORT_VERSION",
                                        description: "Short version string to force resigned ipa to use (`CFBundleShortVersionString`)",
                                        conflicting_options: [:version],
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :bundle_version,
                                        env_name: "FL_RESIGN_BUNDLE_VERSION",
                                        description: "Bundle version to force resigned ipa to use (`CFBundleVersion`)",
                                        conflicting_options: [:version],
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :bundle_id,
                                        env_name: "FL_RESIGN_BUNDLE_ID",
                                        description: "Set new bundle ID during resign (`CFBundleIdentifier`)",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :use_app_entitlements,
                                        env_name: "FL_USE_APP_ENTITLEMENTS",
                                        description: "Extract app bundle codesigning entitlements and combine with entitlements from new provisioning profile",
                                        conflicting_options: [:entitlements],
-                                       is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :keychain_path,
                                        env_name: "FL_RESIGN_KEYCHAIN_PATH",
                                        description: "Provide a path to a keychain file that should be used by `/usr/bin/codesign`",
-                                       is_string: true,
                                        optional: true)
         ]
       end

data/fastlane/lib/fastlane/actions/restore_file.rb

@@ -5,7 +5,7 @@ module Fastlane
         path = params[:path]
         backup_path = "#{path}.back"
         UI.user_error!("Could not find file '#{backup_path}'") unless File.exist?(backup_path)
-        FileUtils.cp(backup_path, path, { preserve: true })
+        FileUtils.cp(backup_path, path, preserve: true)
         FileUtils.rm(backup_path)
         UI.message("Successfully restored backup 📤")
       end

data/fastlane/lib/fastlane/actions/rsync.rb

@@ -32,20 +32,17 @@ module Fastlane
                                        env_name: "FL_RSYNC_EXTRA", # The name of the environment variable
                                        description: "Port", # a short description of this parameter
                                        optional: true,
-                                       default_value: "-av",
-                                       is_string: true),
+                                       default_value: "-av"),
           FastlaneCore::ConfigItem.new(key: :source,
                                        short_option: "-S",
                                        env_name: "FL_RSYNC_SRC", # The name of the environment variable
                                        description: "source file/folder", # a short description of this parameter
-                                       optional: false,
-                                       is_string: true),
+                                       optional: false),
           FastlaneCore::ConfigItem.new(key: :destination,
                                        short_option: "-D",
                                        env_name: "FL_RSYNC_DST", # The name of the environment variable
                                        description: "destination file/folder", # a short description of this parameter
-                                       optional: false,
-                                       is_string: true)
+                                       optional: false)
         ]
       end
 

data/fastlane/lib/fastlane/actions/run_tests.rb

@@ -60,7 +60,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :fail_build,
                                        env_name: "SCAN_FAIL_BUILD",
                                        description: "Should this step stop the build if the tests fail? Set this to false if you're using trainer",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true)
         ]
       end

data/fastlane/lib/fastlane/actions/s3.rb

@@ -52,7 +52,7 @@ module Fastlane
                                        description: "Upload relevant metadata for this build",
                                        optional: true,
                                        default_value: true,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :plist_template_path,
                                        env_name: "",
                                        description: "plist template path",

data/fastlane/lib/fastlane/actions/say.rb

@@ -3,7 +3,7 @@ module Fastlane
     class SayAction < Action
       def self.run(params)
         text = params[:text]
-        text = text.join(' ') if text.kind_of?(Array)
+        text = text.join(' ')
         text = text.tr("'", '"')
 
         if params[:mute]
@@ -23,12 +23,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :text,
                                        description: 'Text to be spoken out loud (as string or array of strings)',
                                        optional: false,
-                                       is_string: false),
+                                       type: Array),
           FastlaneCore::ConfigItem.new(key: :mute,
                                        env_name: "SAY_MUTE",
                                        description: 'If say should be muted with text printed out',
                                        optional: false,
-                                       is_string: false,
                                        type: Boolean,
                                        default_value: false)
         ]

data/fastlane/lib/fastlane/actions/scp.rb

@@ -38,40 +38,34 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :username,
                                        short_option: "-u",
                                        env_name: "FL_SSH_USERNAME",
-                                       description: "Username",
-                                       is_string: true),
+                                       description: "Username"),
           FastlaneCore::ConfigItem.new(key: :password,
                                        short_option: "-p",
                                        env_name: "FL_SSH_PASSWORD",
                                        description: "Password",
                                        sensitive: true,
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :host,
                                        short_option: "-H",
                                        env_name: "FL_SSH_HOST",
-                                       description: "Hostname",
-                                       is_string: true),
+                                       description: "Hostname"),
           FastlaneCore::ConfigItem.new(key: :port,
                                        short_option: "-P",
                                        env_name: "FL_SSH_PORT",
                                        description: "Port",
                                        optional: true,
-                                       default_value: "22",
-                                       is_string: true),
+                                       default_value: "22"),
           FastlaneCore::ConfigItem.new(key: :upload,
                                        short_option: "-U",
                                        env_name: "FL_SCP_UPLOAD",
                                        description: "Upload",
                                        optional: true,
-                                       is_string: false,
                                        type: Hash),
           FastlaneCore::ConfigItem.new(key: :download,
                                        short_option: "-D",
                                        env_name: "FL_SCP_DOWNLOAD",
                                        description: "Download",
                                        optional: true,
-                                       is_string: false,
                                        type: Hash)
 
         ]

data/fastlane/lib/fastlane/actions/set_build_number_repository.rb

@@ -41,7 +41,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),
           FastlaneCore::ConfigItem.new(key: :xcodeproj,
                                        env_name: "XCODEPROJ_PATH",

data/fastlane/lib/fastlane/actions/set_changelog.rb

@@ -6,9 +6,11 @@ module Fastlane
 
         # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
         # Prompts select team if multiple teams and none specified
-        if (token = self.api_token(params))
-          UI.message("Using App Store Connect API token...")
-          Spaceship::ConnectAPI.token = token
+        if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
+          UI.message("Creating authorization token for App Store Connect API")
+          Spaceship::ConnectAPI.token = api_token
+        elsif !Spaceship::ConnectAPI.token.nil?
+          UI.message("Using existing authorization token for App Store Connect API")
         else
           UI.message("Login to App Store Connect (#{params[:username]})")
           Spaceship::ConnectAPI.login(params[:username], use_portal: false, use_tunes: true, tunes_team_id: params[:team_id], team_name: params[:team_name])
@@ -78,13 +80,6 @@ module Fastlane
         UI.success("👼  Successfully pushed the new changelog to for #{edit_version.version_string}")
       end
 
-      def self.api_token(params)
-        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
-        api_token ||= Spaceship::ConnectAPI::Token.create(params[:api_key]) if params[:api_key]
-        api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-        return api_token
-      end
-
       def self.default_changelog_path
         File.join(FastlaneCore::FastlaneFolder.path.to_s, 'changelog.txt')
       end
@@ -111,7 +106,7 @@ module Fastlane
 
         [
           FastlaneCore::ConfigItem.new(key: :api_key_path,
-                                     env_name: "FL_SET_CHANGELOG_API_KEY_PATH",
+                                     env_names: ["FL_SET_CHANGELOG_API_KEY_PATH", "APP_STORE_CONNECT_API_KEY_PATH"],
                                      description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                      optional: true,
                                      conflicting_options: [:api_key],
@@ -119,9 +114,11 @@ module Fastlane
                                        UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                      end),
           FastlaneCore::ConfigItem.new(key: :api_key,
-                                     env_name: "FL_SET_CHANGELOG_API_KEY",
+                                     env_names: ["FL_SET_CHANGELOG_API_KEY", "APP_STORE_CONNECT_API_KEY"],
                                      description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)",
                                      type: Hash,
+                                     default_value: Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::APP_STORE_CONNECT_API_KEY],
+                                     default_value_dynamic: true,
                                      optional: true,
                                      sensitive: true,
                                      conflicting_options: [:api_key_path]),
@@ -152,7 +149,7 @@ module Fastlane
                                        env_name: "FL_SET_CHANGELOG_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,

data/fastlane/lib/fastlane/actions/set_github_release.rb

@@ -13,6 +13,7 @@ module Fastlane
 
         repo_name = params[:repository_name]
         api_token = params[:api_token]
+        api_bearer = params[:api_bearer]
         server_url = params[:server_url]
         tag_name = params[:tag_name]
 
@@ -28,6 +29,7 @@ module Fastlane
         GithubApiAction.run(
           server_url: server_url,
           api_token: api_token,
+          api_bearer: api_bearer,
           http_method: 'POST',
           path: "repos/#{repo_name}/releases",
           body: payload,
@@ -65,12 +67,13 @@ module Fastlane
           assets = params[:upload_assets]
           if assets && assets.count > 0
             # upload assets
-            self.upload_assets(assets, json['upload_url'], api_token)
+            self.upload_assets(assets, json['upload_url'], api_token, api_bearer)
 
             # fetch the release again, so that it contains the uploaded assets
             GithubApiAction.run(
               server_url: server_url,
               api_token: api_token,
+              api_bearer: api_bearer,
               http_method: 'GET',
               path: "repos/#{repo_name}/releases/#{release_id}",
               error_handlers: {
@@ -90,13 +93,13 @@ module Fastlane
         end
       end
 
-      def self.upload_assets(assets, upload_url_template, api_token)
+      def self.upload_assets(assets, upload_url_template, api_token, api_bearer)
         assets.each do |asset|
-          self.upload(asset, upload_url_template, api_token)
+          self.upload(asset, upload_url_template, api_token, api_bearer)
         end
       end
 
-      def self.upload(asset_path, upload_url_template, api_token)
+      def self.upload(asset_path, upload_url_template, api_token, api_bearer)
         # if it's a directory, zip it first in a temp directory, because we can only upload binary files
         absolute_path = File.absolute_path(asset_path)
 
@@ -107,14 +110,14 @@ module Fastlane
           Dir.mktmpdir do |dir|
             tmpzip = File.join(dir, File.basename(absolute_path) + '.zip')
             sh("cd \"#{File.dirname(absolute_path)}\"; zip -r --symlinks \"#{tmpzip}\" \"#{File.basename(absolute_path)}\" 2>&1 >/dev/null")
-            self.upload_file(tmpzip, upload_url_template, api_token)
+            self.upload_file(tmpzip, upload_url_template, api_token, api_bearer)
           end
         else
-          self.upload_file(absolute_path, upload_url_template, api_token)
+          self.upload_file(absolute_path, upload_url_template, api_token, api_bearer)
         end
       end
 
-      def self.upload_file(file, url_template, api_token)
+      def self.upload_file(file, url_template, api_token, api_bearer)
         require 'addressable/template'
         file_name = File.basename(file)
         expanded_url = Addressable::Template.new(url_template).expand(name: file_name).to_s
@@ -122,6 +125,7 @@ module Fastlane
         UI.important("Uploading #{file_name}")
         GithubApiAction.run(
           api_token: api_token,
+          api_bearer: api_bearer,
           http_method: 'POST',
           headers: headers,
           url: expanded_url,
@@ -173,31 +177,35 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: "FL_GITHUB_RELEASE_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_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),
           FastlaneCore::ConfigItem.new(key: :tag_name,
                                        env_name: "FL_SET_GITHUB_RELEASE_TAG_NAME",
                                        description: "Pass in the tag name",
-                                       is_string: true,
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :name,
                                        env_name: "FL_SET_GITHUB_RELEASE_NAME",
                                        description: "Name of this release",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :commitish,
                                        env_name: "FL_SET_GITHUB_RELEASE_COMMITISH",
                                        description: "Specifies the commitish value that determines where the Git tag is created from. Can be any branch or commit SHA. Unused if the Git tag already exists. Default: the repository's default branch (usually master)",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :description,
                                        env_name: "FL_SET_GITHUB_RELEASE_DESCRIPTION",
                                        description: "Description of this release",
-                                       is_string: true,
                                        optional: true,
                                        default_value: Actions.lane_context[SharedValues::FL_CHANGELOG],
                                        default_value_dynamic: true),
@@ -206,18 +214,17 @@ module Fastlane
                                        description: "Whether the release should be marked as draft",
                                        optional: true,
                                        default_value: false,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :is_prerelease,
                                        env_name: "FL_SET_GITHUB_RELEASE_IS_PRERELEASE",
                                        description: "Whether the release should be marked as prerelease",
                                        optional: true,
                                        default_value: false,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :upload_assets,
                                        env_name: "FL_SET_GITHUB_RELEASE_UPLOAD_ASSETS",
                                        description: "Path to assets to be uploaded with the release",
                                        optional: true,
-                                       is_string: false,
                                        type: Array,
                                        verify_block: proc do |value|
                                          UI.user_error!("upload_assets must be an Array of paths to assets") unless value.kind_of?(Array)

data/fastlane/lib/fastlane/actions/set_info_plist_value.rb

@@ -53,7 +53,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :value,
                                        env_name: "FL_SET_INFO_PLIST_PARAM_VALUE",
                                        description: "Value to setup",
-                                       is_string: false,
+                                       skip_type_validation: true, # allow String, Hash
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "FL_SET_INFO_PLIST_PATH",