fastlane 2.183.2 → 2.186.0

data/fastlane/lib/fastlane/actions/ifttt.rb

@@ -53,18 +53,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :value1,
                                        env_name: "IFTTT_VALUE1",
                                        description: "Extra data sent with the event",
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :value2,
                                       env_name: "IFTTT_VALUE2",
                                       description: "Extra data sent with the event",
-                                      optional: true,
-                                      is_string: true),
+                                      optional: true),
           FastlaneCore::ConfigItem.new(key: :value3,
                                        env_name: "IFTTT_VALUE3",
                                        description: "Extra data sent with the event",
-                                       optional: true,
-                                       is_string: true)
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/import_from_git.rb

@@ -24,7 +24,7 @@ module Fastlane
           # `conflicting_options`, `verify_block`) are completely ignored.
           FastlaneCore::ConfigItem.new(key: :url,
                                        description: "The URL of the repository to import the Fastfile from",
-                                       default_value: nil),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :branch,
                                        description: "The branch or tag to check-out on the repository",
                                        default_value: 'HEAD',
@@ -39,12 +39,10 @@ module Fastlane
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :version,
                                        description: "The version to checkout on the repository. Optimistic match operator or multiple conditions can be used to select the latest version within constraints",
-                                       default_value: nil,
-                                       is_string: false,
+                                       type: Array,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :cache_path,
                                        description: "The path to a directory where the repository should be cloned into. Defaults to `nil`, which causes the repository to be cloned on every call, to a temporary directory",
-                                       default_value: nil,
                                        optional: true)
         ]
       end

data/fastlane/lib/fastlane/actions/increment_build_number.rb

@@ -66,11 +66,10 @@ module Fastlane
                                        env_name: "FL_BUILD_NUMBER_BUILD_NUMBER",
                                        description: "Change to a specific version. When you provide this parameter, Apple Generic Versioning does not have to be enabled",
                                        optional: true,
-                                       is_string: false),
+                                       skip_type_validation: true), # allow Integer, String
           FastlaneCore::ConfigItem.new(key: :skip_info_plist,
                                        env_name: "FL_BUILD_NUMBER_SKIP_INFO_PLIST",
                                        description: "Don't update Info.plist files when updating the build version",
-                                       is_string: false,
                                        type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :xcodeproj,

data/fastlane/lib/fastlane/actions/install_on_device.rb

@@ -35,26 +35,23 @@ module Fastlane
                                        short_option: "-X",
                                        env_name: "FL_IOD_EXTRA",
                                        description: "Extra Commandline arguments passed to ios-deploy",
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :device_id,
                                        short_option: "-d",
                                        env_name: "FL_IOD_DEVICE_ID",
                                        description: "id of the device / if not set defaults to first found device",
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :skip_wifi,
                                        short_option: "-w",
                                        env_name: "FL_IOD_WIFI",
                                        description: "Do not search for devices via WiFi",
                                        optional: true,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        short_option: "-i",
                                        env_name: "FL_IOD_IPA",
                                        description: "The IPA file to put on the device",
                                        optional: true,
-                                       is_string: true,
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] || Dir["*.ipa"].first,
                                        default_value_dynamic: true,
                                        verify_block: proc do |value|

data/fastlane/lib/fastlane/actions/installr.rb

@@ -66,35 +66,32 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :api_token,
-                                     env_name: "INSTALLR_API_TOKEN",
-                                     sensitive: true,
-                                     description: "API Token for Installr Access",
-                                     verify_block: proc do |value|
-                                       UI.user_error!("No API token for Installr given, pass using `api_token: 'token'`") unless value && !value.empty?
-                                     end),
+                                       env_name: "INSTALLR_API_TOKEN",
+                                       sensitive: true,
+                                       description: "API Token for Installr Access",
+                                       verify_block: proc do |value|
+                                         UI.user_error!("No API token for Installr given, pass using `api_token: 'token'`") unless value && !value.empty?
+                                       end),
           FastlaneCore::ConfigItem.new(key: :ipa,
-                                     env_name: "INSTALLR_IPA_PATH",
-                                     description: "Path to your IPA file. Optional if you use the _gym_ or _xcodebuild_ action",
-                                     default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
-                                     default_value_dynamic: true,
-                                     verify_block: proc do |value|
-                                       UI.user_error!("Couldn't find build file at path '#{value}'") unless File.exist?(value)
-                                     end),
+                                       env_name: "INSTALLR_IPA_PATH",
+                                       description: "Path to your IPA file. Optional if you use the _gym_ or _xcodebuild_ action",
+                                       default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
+                                       default_value_dynamic: true,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Couldn't find build file at path '#{value}'") unless File.exist?(value)
+                                       end),
           FastlaneCore::ConfigItem.new(key: :notes,
-                                     env_name: "INSTALLR_NOTES",
-                                     description: "Release notes",
-                                     is_string: true,
-                                     optional: true),
+                                       env_name: "INSTALLR_NOTES",
+                                       description: "Release notes",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :notify,
-                                     env_name: "INSTALLR_NOTIFY",
-                                     description: "Groups to notify (e.g. 'dev,qa')",
-                                     is_string: true,
-                                     optional: true),
+                                       env_name: "INSTALLR_NOTIFY",
+                                       description: "Groups to notify (e.g. 'dev,qa')",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :add,
-                                     env_name: "INSTALLR_ADD",
-                                     description: "Groups to add (e.g. 'exec,ops')",
-                                     is_string: true,
-                                     optional: true)
+                                       env_name: "INSTALLR_ADD",
+                                       description: "Groups to add (e.g. 'exec,ops')",
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/ipa.rb

@@ -159,12 +159,12 @@ module Fastlane
                                        env_name: "IPA_CLEAN",
                                        description: "Clean project before building",
                                        optional: true,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :archive,
                                        env_name: "IPA_ARCHIVE",
                                        description: "Archive project after building",
                                        optional: true,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :destination,
                                        env_name: "IPA_DESTINATION",
                                        description: "Build destination. Defaults to current directory",

data/fastlane/lib/fastlane/actions/jazzy.rb

@@ -19,20 +19,14 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(
-            key: :config,
-            env_name: 'FL_JAZZY_CONFIG',
-            description: 'Path to jazzy config file',
-            is_string: true,
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :module_version,
-            env_name: 'FL_JAZZY_MODULE_VERSION',
-            description: 'Version string to use as part of the the default docs title and inside the docset',
-            is_string: true,
-            optional: true
-          )
+          FastlaneCore::ConfigItem.new(key: :config,
+                                       env_name: 'FL_JAZZY_CONFIG',
+                                       description: 'Path to jazzy config file',
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :module_version,
+                                       env_name: 'FL_JAZZY_MODULE_VERSION',
+                                       description: 'Version string to use as part of the the default docs title and inside the docset',
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/push_to_git_remote.rb

@@ -3,8 +3,12 @@ module Fastlane
     # Push local changes to the remote branch
     class PushToGitRemoteAction < Action
       def self.run(params)
+        # Find the local git branch using HEAD or fallback to CI's ENV git branch if you're in detached HEAD state
+        local_git_branch = Actions.git_branch_name_using_HEAD
+        local_git_branch = Actions.git_branch unless local_git_branch && local_git_branch != "HEAD"
+
         local_branch = params[:local_branch]
-        local_branch ||= Actions.git_branch.gsub(%r{#{params[:remote]}\/}, '') if Actions.git_branch
+        local_branch ||= local_git_branch.gsub(%r{#{params[:remote]}\/}, '') if local_git_branch
         UI.user_error!('Failed to get the current branch.') unless local_branch
 
         remote_branch = params[:remote_branch] || local_branch

data/fastlane/lib/fastlane/actions/register_device.rb

@@ -16,9 +16,11 @@ module Fastlane
 
         platform = Spaceship::ConnectAPI::BundleIdPlatform.map(platform)
 
-        if (token = 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]})")
           credentials = CredentialsManager::AccountManager.new(user: params[:username])
@@ -37,13 +39,6 @@ module Fastlane
         return udid
       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.description
         "Registers a new device to the Apple Dev Portal"
       end
@@ -80,6 +75,8 @@ module Fastlane
                                        env_names: ["FL_REGISTER_DEVICE_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]),

data/fastlane/lib/fastlane/actions/register_devices.rb

@@ -39,9 +39,11 @@ module Fastlane
         end
 
         require 'spaceship'
-        if (token = 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]})")
           credentials = CredentialsManager::AccountManager.new(user: params[:username])
@@ -83,13 +85,6 @@ module Fastlane
         UI.crash!("Failed to register new device (name: #{name}, UDID: #{udid})")
       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
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -129,6 +124,8 @@ module Fastlane
                                        env_names: ["FL_REGISTER_DEVICES_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]),

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
@@ -122,6 +117,8 @@ module Fastlane
                                      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]),

data/fastlane/lib/fastlane/actions/swiftlint.rb

@@ -11,8 +11,20 @@ module Fastlane
           UI.user_error!("Your version of swiftlint (#{version}) does not support autocorrect mode.\nUpdate swiftlint using `brew update && brew upgrade swiftlint`")
         end
 
+        # See 'Breaking' section release notes here: https://github.com/realm/SwiftLint/releases/tag/0.43.0
+        if params[:mode] == :autocorrect && version >= Gem::Version.new('0.43.0')
+          UI.deprecated("Your version of swiftlint (#{version}) has deprecated autocorrect mode, please start using fix mode in input param")
+          UI.important("For now, switching swiftlint mode `from :autocorrect to :fix` for you 😇")
+          params[:mode] = :fix
+        elsif params[:mode] == :fix && version < Gem::Version.new('0.43.0')
+          UI.important("Your version of swiftlint (#{version}) does not support fix mode.\nUpdate swiftlint using `brew update && brew upgrade swiftlint`")
+          UI.important("For now, switching swiftlint mode `from :fix to :autocorrect` for you 😇")
+          params[:mode] = :autocorrect
+        end
+
+        mode_format = params[:mode] == :fix ? "--" : ""
         command = (params[:executable] || "swiftlint").dup
-        command << " #{params[:mode]}"
+        command << " #{mode_format}#{params[:mode]}"
         command << optional_flags(params)
 
         if params[:files]
@@ -55,7 +67,7 @@ module Fastlane
       end
 
       def self.supported_no_cache_option(params)
-        if params[:mode] == :autocorrect || params[:mode] == :lint
+        if [:autocorrect, :fix, :lint].include?(params[:mode])
           return " --no-cache"
         else
           return ""
@@ -89,14 +101,13 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :mode,
                                        env_name: "FL_SWIFTLINT_MODE",
-                                       description: "SwiftLint mode: :lint, :autocorrect or :analyze",
-                                       is_string: false,
+                                       description: "SwiftLint mode: :lint, :fix, :autocorrect or :analyze",
+                                       type: Symbol,
                                        default_value: :lint,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "FL_SWIFTLINT_PATH",
                                        description: "Specify path to lint",
-                                       is_string: true,
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Couldn't find path '#{File.expand_path(value)}'") unless File.exist?(value)
@@ -113,20 +124,18 @@ module Fastlane
                                        env_name: "FL_SWIFTLINT_STRICT",
                                        description: 'Fail on warnings? (true/false)',
                                        default_value: false,
-                                       is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :files,
                                        env_name: "FL_SWIFTLINT_FILES",
                                        description: 'List of files to process',
-                                       is_string: false,
+                                       type: Array,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :ignore_exit_status,
                                        env_name: "FL_SWIFTLINT_IGNORE_EXIT_STATUS",
                                        description: "Ignore the exit status of the SwiftLint command, so that serious violations \
                                                     don't fail the build (true/false)",
                                        default_value: false,
-                                       is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :raise_if_swiftlint_error,
@@ -134,14 +143,12 @@ module Fastlane
                                        description: "Raises an error if swiftlint fails, so you can fail CI/CD jobs if necessary \
                                                     (true/false)",
                                        default_value: false,
-                                       is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :reporter,
                                        env_name: "FL_SWIFTLINT_REPORTER",
                                        description: "Choose output reporter. Available: xcode, json, csv, checkstyle, codeclimate, \
                                                      junit, html, emoji, sonarqube, markdown, github-actions-logging",
-                                       is_string: true,
                                        optional: true,
                                        verify_block: proc do |value|
                                          available = ['xcode', 'json', 'csv', 'checkstyle', 'codeclimate', 'junit', 'html', 'emoji', 'sonarqube', 'markdown', 'github-actions-logging']
@@ -151,32 +158,27 @@ module Fastlane
                                        env_name: "FL_SWIFTLINT_QUIET",
                                        description: "Don't print status logs like 'Linting <file>' & 'Done linting'",
                                        default_value: false,
-                                       is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :executable,
                                        env_name: "FL_SWIFTLINT_EXECUTABLE",
                                        description: "Path to the `swiftlint` executable on your machine",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :format,
                                        env_name: "FL_SWIFTLINT_FORMAT",
                                        description: "Format code when mode is :autocorrect",
                                        default_value: false,
-                                       is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :no_cache,
                                        env_name: "FL_SWIFTLINT_NO_CACHE",
                                        description: "Ignore the cache when mode is :autocorrect or :lint",
                                        default_value: false,
-                                       is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :compiler_log_path,
                                        env_name: "FL_SWIFTLINT_COMPILER_LOG_PATH",
                                        description: "Compiler log path when mode is :analyze",
-                                       is_string: true,
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Couldn't find compiler_log_path '#{File.expand_path(value)}'") unless File.exist?(value)

data/fastlane/lib/fastlane/actions/sync_code_signing.rb

@@ -10,7 +10,12 @@ module Fastlane
         require 'match'
 
         params.load_configuration_file("Matchfile")
-        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+
+        # 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
+
         Match::Runner.new.run(params)
 
         define_profile_type(params)