fastlane 2.216.0 → 2.218.0

data/fastlane/lib/fastlane/actions/verify_build.rb

@@ -13,7 +13,7 @@ module Fastlane
 
           self.print_values(values)
 
-          self.evaulate(params, values)
+          self.evaluate(params, values)
         end
       end
 
@@ -24,7 +24,7 @@ module Fastlane
 
         case File.extname(build_path)
         when ".ipa", ".zip"
-          `unzip #{build_path.shellescape} -d #{dir.shellescape} -x '__MACOSX/*' '*.DS_Store'`
+          `unzip #{build_path.shellescape} -d #{dir.shellescape} -x '__MACOSX/*' '*.DS_Store' 2>&1`
           UI.user_error!("Unable to unzip ipa") unless $? == 0
           # Adding extra ** for edge-case ipas where Payload directory is nested.
           app_path = Dir["#{dir}/**/Payload/*.app"].first
@@ -66,7 +66,10 @@ module Fastlane
       end
 
       def self.update_with_profile_info(app_path, values)
-        profile = `cat #{app_path.shellescape}/embedded.mobileprovision | security cms -D`
+        provision_profile_path = "#{app_path}/embedded.mobileprovision"
+        UI.user_error!("Unable to find embedded profile in #{provision_profile_path}") unless File.exist?(provision_profile_path)
+
+        profile = `cat #{provision_profile_path.shellescape} | security cms -D`
         UI.user_error!("Unable to extract profile") unless $? == 0
 
         plist = Plist.parse_xml(profile)
@@ -90,7 +93,7 @@ module Fastlane
                                              title: "Summary for verify_build #{Fastlane::VERSION}")
       end
 
-      def self.evaulate(params, values)
+      def self.evaluate(params, values)
         if params[:provisioning_type]
           UI.user_error!("Mismatched provisioning_type. Required: '#{params[:provisioning_type]}'; Found: '#{values['provisioning_type']}'") unless params[:provisioning_type] == values['provisioning_type']
         end

data/fastlane/lib/fastlane/actions/xcov.rb

@@ -40,7 +40,7 @@ module Fastlane
         begin
           Gem::Specification.find_by_name('xcov')
         rescue Gem::LoadError
-          # Catched missing gem exception and returned empty array
+          # Catch missing gem exception and return empty array
           # to avoid unused_options_spec failure
           return []
         end

data/fastlane/lib/fastlane/cli_tools_distributor.rb

@@ -162,7 +162,7 @@ module Fastlane
       end
 
       def print_bundle_exec_warning(is_slow: false)
-        return if FastlaneCore::Helper.bundler? # user is alread using bundler
+        return if FastlaneCore::Helper.bundler? # user is already using bundler
         return if FastlaneCore::Env.truthy?('SKIP_SLOW_FASTLANE_WARNING') # user disabled the warnings
         return if FastlaneCore::Helper.contained_fastlane? # user uses the bundled fastlane
 

data/fastlane/lib/fastlane/command_line_handler.rb

@@ -26,14 +26,12 @@ module Fastlane
         lane = platform_lane_info[0]
       end
 
-      dot_env = Helper.test? ? nil : options.env
-
       if FastlaneCore::FastlaneFolder.swift?
         disable_runner_upgrades = options.disable_runner_upgrades || false
         swift_server_port = options.swift_server_port
-        Fastlane::SwiftLaneManager.cruise_lane(lane, lane_parameters, dot_env, disable_runner_upgrades: disable_runner_upgrades, swift_server_port: swift_server_port)
+        Fastlane::SwiftLaneManager.cruise_lane(lane, lane_parameters, disable_runner_upgrades: disable_runner_upgrades, swift_server_port: swift_server_port)
       else
-        Fastlane::LaneManager.cruise_lane(platform, lane, lane_parameters, dot_env)
+        Fastlane::LaneManager.cruise_lane(platform, lane, lane_parameters)
       end
     end
 

data/fastlane/lib/fastlane/commands_generator.rb

@@ -68,7 +68,7 @@ module Fastlane
       return if $troubleshoot
       UI.error("---")
       UI.error("Are you sure you want to enable '--troubleshoot'?")
-      UI.error("All commmands will run in full unfiltered output mode.")
+      UI.error("All commands will run in full unfiltered output mode.")
       UI.error("Sensitive data, like passwords, could be printed to the log.")
       UI.error("---")
       if UI.confirm("Do you really want to enable --troubleshoot")
@@ -211,7 +211,7 @@ module Fastlane
         c.action do |args, options|
           if ensure_fastfile
             ff = Fastlane::FastFile.new(File.join(FastlaneCore::FastlaneFolder.path || '.', 'Fastfile'))
-            UI.message("You don't need to run `fastlane docs` manually any more, this will be done automatically for you when running a lane.")
+            UI.message("You don't need to run `fastlane docs` manually anymore, this will be done automatically for you when running a lane.")
             Fastlane::DocsGenerator.run(ff)
           end
         end

data/fastlane/lib/fastlane/fast_file.rb

@@ -187,7 +187,7 @@ module Fastlane
     end
 
     # Execute shell command
-    # Accepts arguments with with and without the command named keyword so that sh
+    # Accepts arguments with and without the command named keyword so that sh
     # behaves like other actions with named keywords
     # https://github.com/fastlane/fastlane/issues/14930
     #

data/fastlane/lib/fastlane/helper/dotenv_helper.rb

@@ -22,7 +22,7 @@ module Fastlane
       end
 
       # loads the dotenvs. First the .env and .env.default and
-      # then override with all speficied extra environments
+      # then override with all specified extra environments
       def self.load_dot_envs_from(env_cl_param, base_path)
         require 'dotenv'
 

data/fastlane/lib/fastlane/helper/git_helper.rb

@@ -121,7 +121,10 @@ module Fastlane
 
     # Returns the current git branch, or "HEAD" if it's not checked out to any branch
     # Can be replaced using the environment variable `GIT_BRANCH`
+    # unless `FL_GIT_BRANCH_DONT_USE_ENV_VARS` is `true`
     def self.git_branch
+      return self.git_branch_name_using_HEAD if FastlaneCore::Env.truthy?('FL_GIT_BRANCH_DONT_USE_ENV_VARS')
+
       env_name = SharedValues::GIT_BRANCH_ENV_VARS.find { |env_var| FastlaneCore::Env.truthy?(env_var) }
       ENV.fetch(env_name.to_s) do
         self.git_branch_name_using_HEAD

data/fastlane/lib/fastlane/junit_generator.rb

@@ -12,7 +12,7 @@ module Fastlane
       xml_path = File.join(Fastlane::ROOT, "lib/assets/report_template.xml.erb")
       xml = ERB.new(File.read(xml_path)).result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
 
-      xml = xml.gsub('system_', 'system-').delete("\e") # Jenkins can not parse 'ESC' symbol
+      xml = xml.gsub('system_', 'system-').delete("\e") # Jenkins cannot parse 'ESC' symbol
 
       begin
         File.write(path, xml)

data/fastlane/lib/fastlane/lane.rb

@@ -24,11 +24,19 @@ module Fastlane
       self.platform = platform
       self.name = name
       self.description = description
-      self.block = block
+      # We want to support _both_ lanes expecting a `Hash` (like `lane :foo do |options|`), and lanes expecting
+      # keyword parameters (like `lane :foo do |param1:, param2:, param3: 'default value'|`)
+      block_expects_keywords = !block.nil? && block.parameters.any? { |type, _| [:key, :keyreq].include?(type) }
+      # Conversion of the `Hash` parameters (passed by `Lane#call`) into keywords has to be explicit in Ruby 3
+      # https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+      self.block = block_expects_keywords ? proc { |options| block.call(**options) } : block
       self.is_private = is_private
     end
 
     # Execute this lane
+    #
+    # @param [Hash] parameters The Hash of parameters to pass to the lane
+    #
     def call(parameters)
       block.call(parameters || {})
     end

data/fastlane/lib/fastlane/lane_manager.rb

@@ -5,9 +5,8 @@ module Fastlane
     # @param platform The name of the platform to execute
     # @param lane_name The name of the lane to execute
     # @param parameters [Hash] The parameters passed from the command line to the lane
-    # @param env Dot Env Information
     # @param A custom Fastfile path, this is used by fastlane.ci
-    def self.cruise_lane(platform, lane, parameters = nil, env = nil, fastfile_path = nil)
+    def self.cruise_lane(platform, lane, parameters = nil, fastfile_path = nil)
       UI.user_error!("lane must be a string") unless lane.kind_of?(String) || lane.nil?
       UI.user_error!("platform must be a string") unless platform.kind_of?(String) || platform.nil?
       UI.user_error!("parameters must be a hash") unless parameters.kind_of?(Hash) || parameters.nil?

data/fastlane/lib/fastlane/plugins/template/%gem_name%.gemspec.erb

@@ -21,15 +21,4 @@ Gem::Specification.new do |spec|
   # since this would cause a circular dependency
 
   # spec.add_dependency 'your-dependency', '~> 1.0.0'
-
-  spec.add_development_dependency('bundler')
-  spec.add_development_dependency('fastlane', '>= <%= Fastlane::VERSION %>')
-  spec.add_development_dependency('pry')
-  spec.add_development_dependency('rake')
-  spec.add_development_dependency('rspec')
-  spec.add_development_dependency('rspec_junit_formatter')
-  spec.add_development_dependency('rubocop', '<%= Fastlane::RUBOCOP_REQUIREMENT %>')
-  spec.add_development_dependency('rubocop-performance')
-  spec.add_development_dependency('rubocop-require_tools')
-  spec.add_development_dependency('simplecov')
 end

data/fastlane/lib/fastlane/plugins/template/.rubocop.yml

@@ -188,5 +188,9 @@ Style/MethodCallWithArgsParentheses:
   - context
   - before
   - after
+Bundler/OrderedGems:
+  Enabled: true
+  TreatCommentsAsGroupSeparators: false
 Gemspec/DevelopmentDependencies:
-  Enabled: false
+  Enabled: true
+  EnforcedStyle: Gemfile

data/fastlane/lib/fastlane/plugins/template/Gemfile.erb

@@ -0,0 +1,27 @@
+source('https://rubygems.org')
+
+# Provides a consistent environment for Ruby projects by tracking and installing exact gem versions.
+gem 'bundler'
+# Automation tool for mobile developers.
+gem 'fastlane', '>= <%= Fastlane::VERSION %>'
+# Provides an interactive debugging environment for Ruby.
+gem 'pry'
+# A simple task automation tool.
+gem 'rake'
+# Behavior-driven testing tool for Ruby.
+gem 'rspec'
+# Formatter for RSpec to generate JUnit compatible reports.
+gem 'rspec_junit_formatter'
+# A Ruby static code analyzer and formatter.
+gem 'rubocop', '<%= Fastlane::RUBOCOP_REQUIREMENT %>'
+# A collection of RuboCop cops for performance optimizations.
+gem 'rubocop-performance'
+# A RuboCop extension focused on enforcing tools.
+gem 'rubocop-require_tools'
+# SimpleCov is a code coverage analysis tool for Ruby.
+gem 'simplecov'
+
+gemspec
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

data/fastlane/lib/fastlane/runner.rb

@@ -15,7 +15,7 @@ module Fastlane
 
     # This will take care of executing **one** lane. That's when the user triggers a lane from the CLI for example
     # This method is **not** executed when switching a lane
-    # @param lane_name The name of the lane to execute
+    # @param lane The name of the lane to execute
     # @param platform The name of the platform to execute
     # @param parameters [Hash] The parameters passed from the command line to the lane
     def execute(lane, platform = nil, parameters = nil)
@@ -124,7 +124,7 @@ module Fastlane
 
     # This is being called from `method_missing` from the Fastfile
     # It's also used when an action is called from another action
-    # @param from_action Indicates if this action is being trigged by another action.
+    # @param from_action Indicates if this action is being triggered by another action.
     #                    If so, it won't show up in summary.
     def trigger_action_by_name(method_sym, custom_dir, from_action, *arguments)
       # First, check if there is a predefined method in the actions folder

data/fastlane/lib/fastlane/setup/setup.rb

@@ -135,7 +135,7 @@ module Fastlane
       runner_source_resources = "#{Fastlane::ROOT}/swift/."
       destination_path = File.expand_path('swift', FastlaneCore::FastlaneFolder.path)
 
-      # Return eearly if already setup
+      # Return early if already setup
       return if File.exist?(destination_path)
 
       # Show message if Fastfile.swift exists but missing Swift classes and Xcode project

data/fastlane/lib/fastlane/swift_lane_manager.rb

@@ -5,8 +5,7 @@ module Fastlane
   class SwiftLaneManager < LaneManagerBase
     # @param lane_name The name of the lane to execute
     # @param parameters [Hash] The parameters passed from the command line to the lane
-    # @param env Dot Env Information
-    def self.cruise_lane(lane, parameters = nil, env = nil, disable_runner_upgrades: false, swift_server_port: nil)
+    def self.cruise_lane(lane, parameters = nil, disable_runner_upgrades: false, swift_server_port: nil)
       UI.user_error!("lane must be a string") unless lane.kind_of?(String) || lane.nil?
       UI.user_error!("parameters must be a hash") unless parameters.kind_of?(Hash) || parameters.nil?
 
@@ -106,7 +105,7 @@ module Fastlane
       end
     end
 
-    def self.swap_paths_in_target(target: nil, file_refs_to_swap: nil, expected_path_to_replacement_path_tuples: nil)
+    def self.swap_paths_in_target(file_refs_to_swap: nil, expected_path_to_replacement_path_tuples: nil)
       made_project_updates = false
       file_refs_to_swap.each do |file_ref|
         expected_path_to_replacement_path_tuples.each do |preinstalled_config_relative_path, user_config_relative_path|
@@ -198,14 +197,12 @@ module Fastlane
 
       # Swap in all new user supplied configs into the project
       project_modified = swap_paths_in_target(
-        target: runner_target,
         file_refs_to_swap: target_file_refs,
         expected_path_to_replacement_path_tuples: new_user_tool_file_paths
       )
 
       # Swap out any configs the user has removed, inserting fastlane defaults
       project_modified = swap_paths_in_target(
-        target: runner_target,
         file_refs_to_swap: target_file_refs,
         expected_path_to_replacement_path_tuples: user_tool_files_possibly_removed
       ) || project_modified

data/fastlane/lib/fastlane/swift_runner_upgrader.rb

@@ -163,7 +163,7 @@ module Fastlane
         group_name = group.name.downcase
         manifest_group_filenames = inverted_hash[group_name]
 
-        # compare the current group files to what the manifest says should minially be there
+        # compare the current group files to what the manifest says should minimally be there
         manifest_group_filenames.each do |filename|
           # current group is missing a file from the manifest, need to add it
           next if existing_group_files_set.include?(filename)
@@ -232,16 +232,19 @@ module Fastlane
     # adds new copy files build phase to fastlane_runner_target
     def add_missing_copy_phase!(dry_run: false)
       # Check if upgrade is needed
-      # If fastlane copy files build phase exists already, we don't need any more changes to the Xcode project
-      phase_copy_sign = self.fastlane_runner_target.copy_files_build_phases.select { |phase_copy| phase_copy.name == "FastlaneRunnerCopySigned" }.first
 
-      old_phase_copy_sign = self.fastlane_runner_target.shell_script_build_phases.select { |phase_copy| phase_copy.shell_script == "cd \"${SRCROOT}\"\ncd ../..\ncp \"${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\" .\n" }.first
+      # Check if Copy Files build phase contains FastlaneRunner target.
+      phase_copy_sign = self.fastlane_runner_target.copy_files_build_phases.map(&:files).flatten.select { |file| file.display_name == "FastlaneRunner" }.first
+
+      # If fastlane copy files build phase exists already, we don't need any more changes to the Xcode project
+      phase_copy_sign = self.fastlane_runner_target.copy_files_build_phases.select { |phase_copy| phase_copy.name == "FastlaneRunnerCopySigned" }.first unless phase_copy_sign
 
       return true if dry_run && phase_copy_sign.nil?
 
       return false if dry_run
 
       # Proceed to upgrade
+      old_phase_copy_sign = self.fastlane_runner_target.shell_script_build_phases.select { |phase_copy| phase_copy.shell_script == "cd \"${SRCROOT}\"\ncd ../..\ncp \"${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\" .\n" }.first
       old_phase_copy_sign.remove_from_project unless old_phase_copy_sign.nil?
 
       unless phase_copy_sign

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.216.0'.freeze
+  VERSION = '2.218.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 = '1.50.2'.freeze

data/fastlane/swift/Actions.swift

@@ -1,5 +1,5 @@
 // Actions.swift
-// Copyright (c) 2023 FastlaneTools
+// Copyright (c) 2024 FastlaneTools
 
 // This autogenerated file will be overwritten or replaced when running "fastlane generate_swift"
 //

data/fastlane/swift/Appfile.swift

@@ -1,5 +1,5 @@
 // Appfile.swift
-// Copyright (c) 2023 FastlaneTools
+// Copyright (c) 2024 FastlaneTools
 
 var appIdentifier: String { return "" } // The bundle identifier of your app
 var appleID: String { return "" } // Your Apple Developer Portal username

data/fastlane/swift/ArgumentProcessor.swift

@@ -1,5 +1,5 @@
 // ArgumentProcessor.swift
-// Copyright (c) 2023 FastlaneTools
+// Copyright (c) 2024 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/Atomic.swift

@@ -1,5 +1,5 @@
 // Atomic.swift
-// Copyright (c) 2023 FastlaneTools
+// Copyright (c) 2024 FastlaneTools
 
 import Foundation
 

data/fastlane/swift/ControlCommand.swift

@@ -1,5 +1,5 @@
 // ControlCommand.swift
-// Copyright (c) 2023 FastlaneTools
+// Copyright (c) 2024 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/Deliverfile.swift

@@ -1,5 +1,5 @@
 // Deliverfile.swift
-// Copyright (c) 2023 FastlaneTools
+// Copyright (c) 2024 FastlaneTools
 
 // This class is automatically included in FastlaneRunner during build
 
@@ -17,4 +17,4 @@ public class Deliverfile: DeliverfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.216.0
+// Generated with fastlane 2.218.0

data/fastlane/swift/DeliverfileProtocol.swift

@@ -1,5 +1,5 @@
 // DeliverfileProtocol.swift
-// Copyright (c) 2023 FastlaneTools
+// Copyright (c) 2024 FastlaneTools
 
 public protocol DeliverfileProtocol: AnyObject {
     /// Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)
@@ -71,10 +71,10 @@ public protocol DeliverfileProtocol: AnyObject {
     /// Rejects the previously submitted build if it's in a state where it's possible
     var rejectIfPossible: Bool { get }
 
-    /// Should the app be automatically released once it's approved? (Can not be used together with `auto_release_date`)
+    /// Should the app be automatically released once it's approved? (Cannot be used together with `auto_release_date`)
     var automaticRelease: Bool? { get }
 
-    /// Date in milliseconds for automatically releasing on pending approval (Can not be used together with `automatic_release`)
+    /// Date in milliseconds for automatically releasing on pending approval (Cannot be used together with `automatic_release`)
     var autoReleaseDate: Int? { get }
 
     /// Enable the phased release feature of iTC
@@ -264,4 +264,4 @@ public extension DeliverfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.120]
+// FastlaneRunnerAPIVersion [0.9.122]