fastlane 2.174.0 → 2.175.0

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

@@ -118,7 +118,7 @@ module Fastlane
                                          UI.user_error!("Could not find file '#{value}'") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_key_path,
-                                       env_name: "FL_REGISTER_DEVICES_API_KEY_PATH",
+                                       env_names: ["FL_REGISTER_DEVICES_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],
@@ -126,7 +126,7 @@ 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_REGISTER_DEVICES_API_KEY",
+                                       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,
                                        optional: true,

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

@@ -111,7 +111,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,7 +119,7 @@ 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,
                                      optional: true,

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

@@ -145,7 +145,7 @@ module Fastlane
                                        optional: true,
                                        verify_block: proc do |value|
                                          available = ['xcode', 'json', 'csv', 'checkstyle', 'codeclimate', 'junit', 'html', 'emoji', 'sonarqube', 'markdown', 'github-actions-logging']
-                                         UI.warning("Known 'reporter' values are '#{available.join("', '")}'. If you're receiving errors from swiftlint related to the reporter, make sure the reporter identifier you're using is correct and it's supported by your version of swiftlint.") unless available.include?(value)
+                                         UI.important("Known 'reporter' values are '#{available.join("', '")}'. If you're receiving errors from swiftlint related to the reporter, make sure the reporter identifier you're using is correct and it's supported by your version of swiftlint.") unless available.include?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :quiet,
                                        env_name: "FL_SWIFTLINT_QUIET",

data/fastlane/lib/fastlane/actions/update_code_signing_settings.rb

@@ -140,7 +140,7 @@ module Fastlane
                                        env_name: "FL_PROJECT_SIGNING_BUILD_CONFIGURATIONS",
                                        optional: true,
                                        type: Array,
-                                       description: "Specify build_configurations you want to toggle the signing mech. (default to all targets)",
+                                       description: "Specify build_configurations you want to toggle the signing mech. (default to all configurations)",
                                        is_string: false),
           FastlaneCore::ConfigItem.new(key: :code_sign_identity,
                                        env_name: "FL_CODE_SIGN_IDENTITY",

data/fastlane/lib/fastlane/documentation/actions_list.rb

@@ -135,7 +135,7 @@ module Fastlane
       if options
         puts(Terminal::Table.new(
                title: "#{name} Options".green,
-               headings: ['Key', 'Description', 'Env Var', 'Default'],
+               headings: ['Key', 'Description', 'Env Var(s)', 'Default'],
                rows: FastlaneCore::PrintTable.transform_output(options)
         ))
       else
@@ -197,7 +197,7 @@ module Fastlane
       if options.kind_of?(Array)
         options.each do |current|
           if current.kind_of?(FastlaneCore::ConfigItem)
-            rows << [current.key.to_s.yellow, current.deprecated ? current.description.red : current.description, current.env_name, current.help_default_value]
+            rows << [current.key.to_s.yellow, current.deprecated ? current.description.red : current.description, current.env_names.join(", "), current.help_default_value]
           elsif current.kind_of?(Array)
             # Legacy actions that don't use the new config manager
             UI.user_error!("Invalid number of elements in this row: #{current}. Must be 2 or 3") unless [2, 3].include?(current.count)

data/fastlane/lib/fastlane/helper/adb_helper.rb

@@ -24,7 +24,7 @@ module Fastlane
           adb_path = File.join(android_home, "platform-tools", "adb")
         end
 
-        self.adb_path = File.expand_path(adb_path)
+        self.adb_path = Helper.get_executable_path(File.expand_path(adb_path))
         self.adb_host = adb_host
       end
 

data/fastlane/lib/fastlane/helper/gem_helper.rb

@@ -10,8 +10,8 @@ module Fastlane
       rescue Gem::LoadError
         UI.error("Could not find gem '#{gem_name}'")
         UI.error("")
-        UI.error("If you installed fastlane using `sudo gem install fastlane` run")
-        UI.command("sudo gem install #{gem_name}")
+        UI.error("If you installed fastlane using `gem install fastlane` run")
+        UI.command("gem install #{gem_name}")
         UI.error("to install the missing gem")
         UI.error("")
         UI.error("If you use a Gemfile add this to your Gemfile:")

data/fastlane/lib/fastlane/version.rb

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

data/fastlane/swift/Deliverfile.swift

@@ -17,4 +17,4 @@ public class Deliverfile: DeliverfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.174.0
+// Generated with fastlane 2.175.0

data/fastlane/swift/DeliverfileProtocol.swift

@@ -256,4 +256,4 @@ public extension DeliverfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.57]
+// FastlaneRunnerAPIVersion [0.9.58]

data/fastlane/swift/Fastlane.swift

@@ -8,7 +8,7 @@ import Foundation
  - parameters:
    - serial: Android serial of the device to use for this command
    - command: All commands you want to pass to the adb command, e.g. `kill-server`
-   - adbPath: The path to your `adb` binary (can be left blank if the ANDROID_SDK_ROOT environment variable is set)
+   - adbPath: The path to your `adb` binary (can be left blank if the ANDROID_SDK_ROOT, ANDROID_HOME or ANDROID_SDK environment variable is set)
 
  - returns: The output of the adb command
 
@@ -3845,7 +3845,7 @@ public func gitAdd(path: Any? = nil,
  Directly commit the given file with the given message
 
  - parameters:
-   - path: The file you want to commit
+   - path: 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
    - message: The commit message that should be used
    - skipGitHooks: Set to true to pass --no-verify to git
    - allowNothingToCommit: Set to true to allow commit without any git changes in the files you want to commit
@@ -8338,7 +8338,7 @@ public func updateAppIdentifier(xcodeproj: String,
    - useAutomaticSigning: Defines if project should use automatic signing
    - teamId: Team ID, is used when upgrading project
    - targets: Specify targets you want to toggle the signing mech. (default to all targets)
-   - buildConfigurations: Specify build_configurations you want to toggle the signing mech. (default to all targets)
+   - buildConfigurations: Specify build_configurations you want to toggle the signing mech. (default to all configurations)
    - codeSignIdentity: Code signing identity type (iPhone Developer, iPhone Distribution)
    - profileName: Provisioning profile name to use for code signing
    - profileUuid: Provisioning profile UUID to use for code signing
@@ -9645,4 +9645,4 @@ public let snapshotfile = Snapshotfile()
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.110]
+// FastlaneRunnerAPIVersion [0.9.111]

data/fastlane/swift/Gymfile.swift

@@ -17,4 +17,4 @@ public class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.174.0
+// Generated with fastlane 2.175.0

data/fastlane/swift/GymfileProtocol.swift

@@ -196,4 +196,4 @@ public extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.60]
+// FastlaneRunnerAPIVersion [0.9.61]

data/fastlane/swift/Matchfile.swift

@@ -17,4 +17,4 @@ public class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.174.0
+// Generated with fastlane 2.175.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -184,4 +184,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.54]
+// FastlaneRunnerAPIVersion [0.9.55]

data/fastlane/swift/Precheckfile.swift

@@ -17,4 +17,4 @@ public class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.174.0
+// Generated with fastlane 2.175.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -52,4 +52,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.53]
+// FastlaneRunnerAPIVersion [0.9.54]

data/fastlane/swift/Scanfile.swift

@@ -17,4 +17,4 @@ public class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.174.0
+// Generated with fastlane 2.175.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -280,4 +280,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.65]
+// FastlaneRunnerAPIVersion [0.9.66]

data/fastlane/swift/Screengrabfile.swift

@@ -17,4 +17,4 @@ public class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.174.0
+// Generated with fastlane 2.175.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -96,4 +96,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.55]
+// FastlaneRunnerAPIVersion [0.9.56]

data/fastlane/swift/Snapshotfile.swift

@@ -17,4 +17,4 @@ public class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.174.0
+// Generated with fastlane 2.175.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -196,4 +196,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.49]
+// FastlaneRunnerAPIVersion [0.9.50]

data/fastlane/swift/formatting/Brewfile.lock.json

@@ -4,8 +4,10 @@
       "swiftformat": {
         "version": "0.47.11",
         "bottle": {
+          "rebuild": 0,
           "cellar": ":any_skip_relocation",
           "prefix": "/usr/local",
+          "root_url": "https://homebrew.bintray.com/bottles",
           "files": {
             "arm64_big_sur": {
               "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.11.arm64_big_sur.bottle.tar.gz",
@@ -31,9 +33,9 @@
   "system": {
     "macos": {
       "catalina": {
-        "HOMEBREW_VERSION": "3.0.0-57-g59dd425",
+        "HOMEBREW_VERSION": "3.0.1-93-g53d840c",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "637196b33ecd885dc057c16fc5cb652a4561f632",
+        "Homebrew/homebrew-core": "703451fe242d959d029d867909ffd92f0d522ffd",
         "CLT": "11.0.33.12",
         "Xcode": "12.2",
         "macOS": "10.15.7"

data/fastlane_core/lib/fastlane_core/command_executor.rb

@@ -13,16 +13,10 @@ module FastlaneCore
       #
       # Derived from https://stackoverflow.com/a/5471032/3005
       def which(cmd)
-        # PATHEXT contains the list of file extensions that Windows considers executable, semicolon separated.
-        # e.g. ".COM;.EXE;.BAT;.CMD"
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : []
-        exts << '' # Always have an empty string (= no file extension)
-
         ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each do |ext|
-            cmd_path = File.join(path, "#{cmd}#{ext}")
-            return cmd_path if Helper.executable?(cmd_path)
-          end
+          cmd_path = File.join(path, cmd)
+          executable_path = Helper.get_executable_path(cmd_path)
+          return executable_path if Helper.executable?(executable_path)
         end
 
         return nil

data/fastlane_core/lib/fastlane_core/configuration/commander_generator.rb

@@ -67,7 +67,7 @@ module FastlaneCore
         long_switch = "--#{option.key} #{value_appendix}"
 
         description = option.description
-        description += " (#{option.env_name})" unless option.env_name.to_s.empty?
+        description += " (#{option.env_names.join(', ')})" unless option.env_names.empty?
 
         # We compact this array here to remove the short_switch variable if it is nil.
         # Passing a nil value to global_option has been shown to create problems with

data/fastlane_core/lib/fastlane_core/configuration/config_item.rb

@@ -12,6 +12,9 @@ module FastlaneCore
     # [String] the name of the environment variable, which is only used if no other values were found
     attr_accessor :env_name
 
+    # [Array] the names of the environment variables, which is only used if no other values were found
+    attr_accessor :env_names
+
     # [String] A description shown to the user
     attr_accessor :description
 
@@ -71,6 +74,7 @@ module FastlaneCore
     # Creates a new option
     # @param key (Symbol) the key which is used as command parameters or key in the fastlane tools
     # @param env_name (String) the name of the environment variable, which is only used if no other values were found
+    # @param env_names (Array) the names of the environment variables, which is only used if no other values were found
     # @param description (String) A description shown to the user
     # @param short_option (String) A string of length 1 which is used for the command parameters (e.g. -f)
     # @param default_value the value which is used if there was no given values and no environment values
@@ -88,8 +92,10 @@ module FastlaneCore
     # @param sensitive (Boolean) Set if the variable is sensitive, such as a password or API token, to prevent echoing when prompted for the parameter
     # @param display_in_shell (Boolean) Set if the variable can be used from shell
     # rubocop:disable Metrics/ParameterLists
+    # rubocop:disable Metrics/PerceivedComplexity
     def initialize(key: nil,
                    env_name: nil,
+                   env_names: nil,
                    description: nil,
                    short_option: nil,
                    default_value: nil,
@@ -109,6 +115,11 @@ module FastlaneCore
       UI.user_error!("key must be a symbol") unless key.kind_of?(Symbol)
       UI.user_error!("env_name must be a String") unless (env_name || '').kind_of?(String)
 
+      UI.user_error!("env_names must be an Array") unless (env_names || []).kind_of?(Array)
+      (env_names || []).each do |name|
+        UI.user_error!("env_names must only contain String") unless (name || '').kind_of?(String)
+      end
+
       if short_option
         UI.user_error!("short_option for key :#{key} must of type String") unless short_option.kind_of?(String)
         UI.user_error!("short_option for key :#{key} must be a string of length 1") unless short_option.delete('-').length == 1
@@ -138,6 +149,7 @@ module FastlaneCore
 
       @key = key
       @env_name = env_name
+      @env_names = [env_name].compact + (env_names || [])
       @description = description
       @short_option = short_option
       @default_value = default_value
@@ -160,6 +172,7 @@ module FastlaneCore
 
       update_code_gen_default_value_if_able!
     end
+    # rubocop:enable Metrics/PerceivedComplexity
     # rubocop:enable Metrics/ParameterLists
 
     # if code_gen_default_value is nil, use the default value if it isn't a `code_gen_sensitive` value
@@ -228,6 +241,16 @@ module FastlaneCore
       true
     end
 
+    def fetch_env_value
+      env_names.each do |name|
+        next if ENV[name].nil?
+        # verify! before using (see https://github.com/fastlane/fastlane/issues/14449)
+        return ENV[name].dup if verify!(auto_convert_value(ENV[name]))
+      end
+
+      return nil
+    end
+
     # rubocop:disable Metrics/PerceivedComplexity
     # Returns an updated value type (if necessary)
     def auto_convert_value(value)

data/fastlane_core/lib/fastlane_core/configuration/configuration.rb

@@ -209,7 +209,6 @@ module FastlaneCore
 
     # Returns the value for a certain key. fastlane_core tries to fetch the value from different sources
     # if 'ask' is true and the value is not present, the user will be prompted to provide a value
-    # rubocop:disable Metrics/PerceivedComplexity
     def fetch(key, ask: true)
       UI.crash!("Key '#{key}' must be a symbol. Example :app_id.") unless key.kind_of?(Symbol)
 
@@ -218,9 +217,8 @@ module FastlaneCore
       # Same order as https://docs.fastlane.tools/advanced/#priorities-of-parameters-and-options
       value = if @values.key?(key) && !@values[key].nil?
                 @values[key]
-              elsif option.env_name && !ENV[option.env_name].nil?
-                # verify! before using (see https://github.com/fastlane/fastlane/issues/14449)
-                ENV[option.env_name].dup if option.verify!(option.auto_convert_value(ENV[option.env_name]))
+              elsif (env_value = option.fetch_env_value)
+                env_value
               elsif self.config_file_options.key?(key)
                 self.config_file_options[key]
               else

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -368,8 +368,29 @@ module FastlaneCore
 
     # checks if a given path is an executable file
     def self.executable?(cmd_path)
-      # no executable files on Windows, so existing is enough there
-      cmd_path && !File.directory?(cmd_path) && (File.executable?(cmd_path) || (self.windows? && File.exist?(cmd_path)))
+      if !cmd_path || File.directory?(cmd_path)
+        return false
+      end
+
+      return File.exist?(get_executable_path(cmd_path))
+    end
+
+    # returns the path of the executable with the correct extension on Windows
+    def self.get_executable_path(cmd_path)
+      if self.windows?
+        # PATHEXT contains the list of file extensions that Windows considers executable, semicolon separated.
+        # e.g. ".COM;.EXE;.BAT;.CMD"
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : []
+
+        # no executable files on Windows, so existing is enough there
+        # also check if command + ext is present
+        exts.each do |ext|
+          executable_path = "#{cmd_path}#{ext.downcase}"
+          return executable_path if File.exist?(executable_path)
+        end
+      end
+
+      return cmd_path
     end
 
     # checks if given file is a valid json file
@@ -425,20 +446,20 @@ module FastlaneCore
       UI.current.log
     end
 
-    def self.ask_password(message: "Passphrase: ", confirm: nil)
+    def self.ask_password(message: "Passphrase: ", confirm: nil, confirmation_message: "Type passphrase again: ")
       raise "This code should only run in interactive mode" unless UI.interactive?
 
       loop do
         password = UI.password(message)
         if confirm
-          password2 = UI.password("Type passphrase again: ")
+          password2 = UI.password(confirmation_message)
           if password == password2
             return password
           end
         else
           return password
         end
-        UI.error("Passphrases differ. Try again")
+        UI.error("Your entries do not match. Please try again")
       end
     end
   end

data/fastlane_core/lib/fastlane_core/keychain_importer.rb

@@ -99,7 +99,7 @@ module FastlaneCore
           UI.important("Enter the password for #{keychain_path}")
           UI.important("This passphrase will be stored in your local keychain with the name #{server} and used in future runs")
           UI.important("This prompt can be avoided by specifying the 'keychain_password' option or 'MATCH_KEYCHAIN_PASSWORD' environment variable")
-          keychain_password = FastlaneCore::Helper.ask_password(message: "Password for #{keychain_name} keychain: ", confirm: true)
+          keychain_password = FastlaneCore::Helper.ask_password(message: "Password for #{keychain_name} keychain: ", confirm: true, confirmation_message: "Type password for #{keychain_name} keychain again: ")
           Security::InternetPassword.add(server, "", keychain_password)
         else
           UI.important("Keychain password for #{keychain_path} was not specified and not found in your keychain. Specify the 'keychain_password' option to prevent the UI permission popup when code signing")