fastlane 2.229.0 → 2.232.2

data/deliver/lib/deliver/app_screenshot_validator.rb

@@ -3,25 +3,22 @@ require 'fastimage'
 module Deliver
   class AppScreenshotValidator
     # A simple structure that holds error information as well as formatted error messages consistently
-    # Set `to_skip` to `true` when just needing to skip uploading rather than causing a crash.
     class ValidationError
       # Constants that can be given to `type` param
       INVALID_SCREEN_SIZE = 'Invalid screen size'.freeze
-      UNACCEPTABLE_DEVICE = 'Not an accepted App Store Connect device'.freeze
       INVALID_FILE_EXTENSION = 'Invalid file extension'.freeze
       FILE_EXTENSION_MISMATCH = 'File extension mismatches its image format'.freeze
 
-      attr_reader :type, :path, :debug_info, :to_skip
+      attr_reader :type, :path, :debug_info
 
-      def initialize(type: nil, path: nil, debug_info: nil, to_skip: false)
+      def initialize(type: nil, path: nil, debug_info: nil)
         @type = type
         @path = path
         @debug_info = debug_info
-        @to_skip = to_skip
       end
 
       def to_s
-        "#{to_skip ? '🏃 Skipping' : '🚫 Error'}: #{path} - #{type} (#{debug_info})"
+        "🚫 Error: #{path} - #{type} (#{debug_info})"
       end
 
       def inspect
@@ -46,7 +43,6 @@ module Deliver
       errors_found = []
 
       validate_screen_size(screenshot, errors_found)
-      validate_device_type(screenshot, errors_found)
       validate_file_extension_and_format(screenshot, errors_found)
 
       # Merge errors found into given errors array
@@ -55,22 +51,10 @@ module Deliver
     end
 
     def self.validate_screen_size(screenshot, errors_found)
-      if screenshot.screen_size.nil?
+      if screenshot.display_type.nil?
         errors_found << ValidationError.new(type: ValidationError::INVALID_SCREEN_SIZE,
                                             path: screenshot.path,
-                                            debug_info: "Actual size is #{get_formatted_size(screenshot)}. See the specifications to fix #{APP_SCREENSHOT_SPEC_URL}")
-      end
-    end
-
-    # Checking if the device type exists in spaceship
-    # Ex: iPhone 6.1 inch isn't supported in App Store Connect but need
-    # to have it in there for frameit support
-    def self.validate_device_type(screenshot, errors_found)
-      if !screenshot.screen_size.nil? && screenshot.device_type.nil?
-        errors_found << ValidationError.new(type: ValidationError::UNACCEPTABLE_DEVICE,
-                                            path: screenshot.path,
-                                            debug_info: "Screen size #{screenshot.screen_size} is not accepted. See the specifications to fix #{APP_SCREENSHOT_SPEC_URL}",
-                                            to_skip: true)
+                                            debug_info: "Screenshot size is not supported. Actual size is #{get_formatted_size(screenshot)}. See the specifications to fix #{APP_SCREENSHOT_SPEC_URL}")
       end
     end
 

data/deliver/lib/deliver/loader.rb

@@ -100,16 +100,9 @@ module Deliver
       errors = []
       valid_screenshots = screenshots.select { |screenshot| Deliver::AppScreenshotValidator.validate(screenshot, errors) }
 
-      errors_to_skip, errors_to_crash = errors.partition(&:to_skip)
-
-      unless errors_to_skip.empty?
-        UI.important("🏃 Screenshots to be skipped are detected!")
-        errors_to_skip.each { |error| UI.message(error) }
-      end
-
-      unless errors_to_crash.empty?
+      unless errors.empty?
         UI.important("🚫 Invalid screenshots were detected! Here are the reasons:")
-        errors_to_crash.each { |error| UI.error(error) }
+        errors.each { |error| UI.error(error) }
         UI.user_error!("Canceled uploading screenshots. Please check the error messages above and fix the screenshots.")
       end
 

data/deliver/lib/deliver/upload_metadata.rb

@@ -705,6 +705,11 @@ module Deliver
     def app_rating(app_info)
       return unless options[:app_rating_config_path]
 
+      unless app_info
+        UI.important("Skipping age rating update because app info could not be fetched.")
+        return
+      end
+
       require 'json'
       begin
         json = JSON.parse(File.read(options[:app_rating_config_path]))

data/deliver/lib/deliver/upload_screenshots.rb

@@ -93,7 +93,9 @@ module Deliver
 
       # Verify all screenshots have been deleted
       # Sometimes API requests will fail but screenshots will still be deleted
-      count = iterator.each_app_screenshot_set.map { |_, app_screenshot_set| app_screenshot_set }
+      count = iterator.each_app_screenshot_set
+                      .select { |localization, _| screenshots_per_language.keys.include?(localization.locale) }
+                      .map { |_, app_screenshot_set| app_screenshot_set }
                       .reduce(0) { |sum, app_screenshot_set| sum + app_screenshot_set.app_screenshots.size }
 
       UI.important("Number of screenshots not deleted: #{count}")
@@ -134,7 +136,7 @@ module Deliver
         number_of_screenshots_per_set[app_screenshot_set] ||= (app_screenshot_set.app_screenshots || []).count
 
         if number_of_screenshots_per_set[app_screenshot_set] >= 10
-          UI.error("Too many screenshots found for device '#{screenshot.device_type}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
+          UI.error("Too many screenshots found for device '#{screenshot.display_type}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
           next
         end
 

data/fastlane/lib/assets/completions/completion.bash

@@ -21,6 +21,6 @@ _fastlane_complete() {
   completions="$(sed -En 's/^[ 	]*lane +:([^ 	]+).*$/\1/p' "$file")"
   completions="$completions update_fastlane"
 
-  COMPREPLY=( $(compgen -W "$completions" -- "$word") )
+  mapfile -t COMPREPLY < <(compgen -W "$completions" -- "$word")
 }
 

data/fastlane/lib/assets/completions/completion.sh

@@ -4,9 +4,9 @@
 # shellcheck disable=SC2039
 
 if [ -n "$BASH_VERSION" ]; then
-  source ~/.fastlane/completions/completion.bash
+  . ~/.fastlane/completions/completion.bash
 elif [ -n "$ZSH_VERSION" ]; then
-  source ~/.fastlane/completions/completion.zsh
+  . ~/.fastlane/completions/completion.zsh
 fi
 
 # Do not remove v0.0.1

data/fastlane/lib/fastlane/actions/app_store_build_number.rb

@@ -66,17 +66,21 @@ module Fastlane
           version_number = params[:version]
           platform = params[:platform]
 
-          # Create filter for get_builds with optional version number
-          filter = { app: app.id }
+          # Create filter for get_build_uploads to exclude builds in AWAITING_UPLOAD state
+          # AWAITING_UPLOAD builds have no uploadedDate, which would break the sort order
+          filter = { state: "PROCESSING,FAILED,COMPLETE" }
+
+          # Append optional version number filter
           if version_number
-            filter["preReleaseVersion.version"] = version_number
+            filter["cfBundleShortVersionString"] = version_number
             version_number_message = "version #{version_number}"
           else
             version_number_message = "any version"
           end
 
+          # Append optional platform filter
           if platform
-            filter["preReleaseVersion.platform"] = Spaceship::ConnectAPI::Platform.map(platform)
+            filter["platform"] = Spaceship::ConnectAPI::Platform.map(platform)
             platform_message = "#{platform} platform"
           else
             platform_message = "any platform"
@@ -84,19 +88,20 @@ module Fastlane
 
           UI.message("Fetching the latest build number for #{version_number_message}")
 
-          # Get latest build for optional version number and return build number if found
-          build = Spaceship::ConnectAPI.get_builds(filter: filter, sort: "-uploadedDate", includes: "preReleaseVersion", limit: 1).first
-          if build
-            build_nr = build.version
-            UI.message("Latest upload for version #{build.app_version} on #{platform_message} is build: #{build_nr}")
-            return OpenStruct.new({ build_nr: build_nr, build_v: build.app_version })
+          # Get latest build upload for optional version number and return build number if found
+          build_upload = Spaceship::ConnectAPI.get_build_uploads(app_id: app.id, filter: filter, sort: "-uploadedDate", limit: 1).first
+          if build_upload
+            build_nr = build_upload.cf_build_version
+            build_v = build_upload.cf_build_short_version_string
+            UI.message("Latest upload for version #{build_v} on #{platform_message} is build: #{build_nr}")
+            return OpenStruct.new({ build_nr: build_nr, build_v: build_v })
           end
 
-          # Let user know that build couldn't be found
-          UI.important("Could not find a build for #{version_number_message} on #{platform_message} on App Store Connect")
+          # Let user know that build upload couldn't be found
+          UI.important("Could not find a build upload for #{version_number_message} on #{platform_message} on App Store Connect")
 
           if params[:initial_build_number].nil?
-            UI.user_error!("Could not find a build on App Store Connect - and 'initial_build_number' option is not set")
+            UI.user_error!("Could not find a build upload on App Store Connect - and 'initial_build_number' option is not set")
           else
             build_nr = params[:initial_build_number]
             UI.message("Using initial build number of #{build_nr}")
@@ -140,7 +145,7 @@ module Fastlane
                                        conflicting_options: [:api_key_path]),
           FastlaneCore::ConfigItem.new(key: :initial_build_number,
                                        env_name: "INITIAL_BUILD_NUMBER",
-                                       description: "sets the build number to given value if no build is in current train",
+                                       description: "sets the build number to given value if no build (upload) is in current train",
                                        skip_type_validation: true), # as we also allow integers, which we convert to strings anyway
           FastlaneCore::ConfigItem.new(key: :app_identifier,
                                        short_option: "-a",

data/fastlane/lib/fastlane/actions/appium.rb

@@ -90,7 +90,7 @@ module Fastlane
               port: params[:port],
               appium_lib: appium_lib
             ).start_driver
-            Appium.promote_appium_methods(RSpec::Core::ExampleGroup)
+            Appium.promote_appium_methods(RSpec::Core::ExampleGroup, @driver)
           end
 
           c.after(:each) do

data/fastlane/lib/fastlane/actions/docs/create_app_online.md

@@ -138,10 +138,11 @@ fastlane produce enable_services --help
 --associated-domains                  Enable Associated Domains
 --auto-fill-credential                Enable Auto Fill Credential
 --class-kit                           Enable Class Kit
---icloud STRING                        Enable iCloud, suitable values are "xcode5_compatible" and "xcode6_compatible"
+--icloud STRING                       Enable iCloud, suitable values are "xcode5_compatible" and "xcode6_compatible"
 --custom-network-protocol             Enable Custom Network Protocol
 --data-protection STRING              Enable Data Protection, suitable values are "complete", "unlessopen" and "untilfirstauth"
 --extended-virtual-address-space      Enable Extended Virtual Address Space
+--declared-age-range                  Enable Declared Age Range capability
 --game-center STRING                  Enable Game Center, suitable values are "ios" and "macos
 --health-kit                          Enable Health Kit
 --hls-interstitial-preview            Enable Hls Interstitial Preview
@@ -201,10 +202,11 @@ fastlane produce disable_services --help
 --associated-domains                  Disable Associated Domains
 --auto-fill-credential                Disable Auto Fill Credential
 --class-kit                           Disable Class Kit
---icloud STRING                        Disable iCloud
+--icloud STRING                       Disable iCloud
 --custom-network-protocol             Disable Custom Network Protocol
 --data-protection STRING              Disable Data Protection
 --extended-virtual-address-space      Disable Extended Virtual Address Space
+--declared-age-range                  Disable Declared Age Range capability
 --game-center STRING                  Disable Game Center
 --health-kit                          Disable Health Kit
 --hls-interstitial-preview            Disable Hls Interstitial Preview
@@ -302,7 +304,7 @@ lane :release do
     app_version: '1.0',
     sku: '123',
     team_name: 'SunApps GmbH', # only necessary when in multiple teams
-    
+
     # Optional
     # App services can be enabled during app creation
     enable_services: {
@@ -317,6 +319,7 @@ lane :release do
       car_play_navigation_app: "on",            # Valid values: "on", "off"
       car_play_voip_calling_app: "on",          # Valid values: "on", "off"
       class_kit: "on",                          # Valid values: "on", "off"
+      declared_age_range: "on",                 # Valid values: "on", "off"
       icloud: "xcode5_compatible",              # Valid values: "xcode5_compatible", "xcode6_compatible", "off"
       critical_alerts: "on",                    # Valid values: "on", "off"
       custom_network_protocol: "on",            # Valid values: "on", "off"

data/fastlane/lib/fastlane/actions/docs/sync_code_signing.md

@@ -215,7 +215,9 @@ fastlane match development
 This will create a new certificate and provisioning profile (if required) and store them in your selected storage.
 If you previously ran _match_ with the configured storage it will automatically install the existing profiles from your storage.
 
-The provisioning profiles are installed in `~/Library/MobileDevice/Provisioning Profiles` while the certificates and private keys are installed in your Keychain.
+The provisioning profiles are installed in `~/Library/Developer/Xcode/UserData/Provisioning Profiles` (`~/Library/MobileDevice/Provisioning Profiles` for Xcode versions prior to 16.0) while the certificates and private keys are installed in your Keychain.
+
+> fastlane relies on the system's default Xcode version to determine the current version. The path where provisioning profiles are stored changed in Xcode 16. If you use the `xcode_select` or `xcodes` actions and you have Xcode 15 and 16 installed in your system, please make sure to execute them before invoking the `sync_code_signing` action.  
 
 To get a more detailed output of what _match_ is doing use
 

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -597,7 +597,9 @@ Key | Editable While Live | Directory | Filename | Deprecated Filename
 - 2: Frequent/Intense (Legacy value, use `FREQUENT_OR_INTENSE`instead)
 
 - `NONE`
+- `INFREQUENT`
 - `INFREQUENT_OR_MILD`
+- `FREQUENT`
 - `FREQUENT_OR_INTENSE`
 
 **Keys**
@@ -605,19 +607,33 @@ Key | Editable While Live | Directory | Filename | Deprecated Filename
 - `alcoholTobaccoOrDrugUseOrReferences`
 - `contests`
 - `gamblingSimulated`
-- `medicalOrTreatmentInformation`
-- `profanityOrCrudeHumor`
-
+- `gunsOrOtherWeapons`
 - `horrorOrFearThemes`
-- `kidsAgeBand`
 - `matureOrSuggestiveThemes`
+- `medicalOrTreatmentInformation`
+- `profanityOrCrudeHumor`
 - `sexualContentGraphicAndNudity`
 - `sexualContentOrNudity`
 - `violenceCartoonOrFantasy`
 - `violenceRealistic`
 - `violenceRealisticProlongedGraphicOrSadistic`
 
-#### Fifteen Plus or Nineteen Plus
+#### Age Rating
+
+**Values**
+
+- `NONE`
+- `NINE_PLUS`
+- `THIRTEEN_PLUS`
+- `SIXTEEN_PLUS`
+- `EIGHTEEN_PLUS`
+- `UNRATED`
+
+**Keys**
+
+- `ageRatingOverrideV2`
+
+#### Korea Age Rating
 
 **Values**
 
@@ -629,13 +645,25 @@ Key | Editable While Live | Directory | Filename | Deprecated Filename
 
 - `koreaAgeRatingOverride`
 
+#### URL
+
+**Keys**
+
+- `developerAgeRatingInfoUrl`
+
 #### Boolean
 
 **Keys**
 
+- `advertising`
+- `ageAssurance`
 - `gambling`
-- `unrestrictedWebAccess`
+- `healthOrWellnessTopics`
 - `lootBox`
+- `messagingAndChat`
+- `parentalControls`
+- `unrestrictedWebAccess`
+- `userGeneratedContent`
 
 #### Kids Age
 

data/fastlane/lib/fastlane/actions/docs/upload_to_testflight.md

@@ -82,6 +82,8 @@ _pilot_ uses [_spaceship_](https://spaceship.airforce) to submit the build metad
 ### Upload from Linux
 
 To upload binaries from Linux:
+
+- have the package file and the `AppStoreInfo.plist` file in the same location on disk (_check [fastlane gym](https://docs.fastlane.tools/actions/gym/) on how to make them_)
 - make sure you have [Transporter on Linux](https://help.apple.com/itc/transporteruserguide/en.lproj/static.html) installed
 - set the following environment variables:
     - `FASTLANE_ITUNES_TRANSPORTER_USE_SHELL_SCRIPT=true`

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -69,7 +69,7 @@ module Fastlane
 
           # Returns if only one non-test target
           if non_test_targets.count == 1
-            return targets.first
+            return non_test_targets.first
           end
 
           options = targets.map(&:name)

data/fastlane/lib/fastlane/actions/import_certificate.rb

@@ -6,7 +6,7 @@ module Fastlane
       def self.run(params)
         keychain_path = params[:keychain_path] || FastlaneCore::Helper.keychain_path(params[:keychain_name])
 
-        FastlaneCore::KeychainImporter.import_file(params[:certificate_path], keychain_path, keychain_password: params[:keychain_password], certificate_password: params[:certificate_password], output: params[:log_output])
+        FastlaneCore::KeychainImporter.import_file(params[:certificate_path], keychain_path, keychain_password: params[:keychain_password], certificate_password: params[:certificate_password], certificate_format: params[:certificate_format], output: params[:log_output])
       end
 
       def self.description
@@ -23,6 +23,9 @@ module Fastlane
                                        sensitive: true,
                                        default_value: "",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :certificate_format,
+                                       description: "Format of the certificate. Check the '-f' switch from 'security import --help' command",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :keychain_name,
                                        env_name: "KEYCHAIN_NAME",
                                        description: "Keychain the items should be imported to",
@@ -65,6 +68,11 @@ module Fastlane
           )',
           'import_certificate(
             certificate_path: "certs/development.cer"
+          )',
+          'import_certificate(
+            certificate_path: "certs/dist.p12",
+            certificate_password: ENV["CERTIFICATE_PASSWORD"] || "default",
+            certificate_format: "pkcs12"
           )'
         ]
       end

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

@@ -8,7 +8,7 @@ module Fastlane
       require 'shellwords'
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        [:ios, :mac, :xros].include?(platform)
       end
 
       def self.run(params)

data/fastlane/lib/fastlane/actions/install_xcode_plugin.rb

@@ -3,6 +3,7 @@ module Fastlane
     class InstallXcodePluginAction < Action
       def self.run(params)
         require 'fileutils'
+        require 'tmpdir'
 
         if params[:github]
           base_api_url = params[:github].sub('https://github.com', 'https://api.github.com/repos')
@@ -25,10 +26,10 @@ module Fastlane
         end
 
         zip_path = File.join(Dir.tmpdir, 'plugin.zip')
-        sh("curl -Lso #{zip_path} #{params[:url]}")
+        Action.sh("curl", "-L", "-s", "-o", zip_path, params[:url])
         plugins_path = "#{ENV['HOME']}/Library/Application Support/Developer/Shared/Xcode/Plug-ins"
         FileUtils.mkdir_p(plugins_path)
-        Action.sh("unzip -qo '#{zip_path}' -d '#{plugins_path}'")
+        Action.sh("unzip", "-qo", zip_path, "-d", plugins_path)
 
         UI.success("Plugin #{File.basename(params[:url], '.zip')} installed successfully")
         UI.message("Please restart Xcode to use the newly installed plugin")

data/fastlane/lib/fastlane/actions/latest_testflight_build_number.rb

@@ -87,7 +87,7 @@ module Fastlane
                                        end),
           FastlaneCore::ConfigItem.new(key: :initial_build_number,
                                        env_name: "INITIAL_BUILD_NUMBER",
-                                       description: "sets the build number to given value if no build is in current train",
+                                       description: "sets the build number to given value if no build (upload) is in current train",
                                        default_value: 1,
                                        skip_type_validation: true), # allow Integer, String
           FastlaneCore::ConfigItem.new(key: :team_id,

data/fastlane/lib/fastlane/actions/modify_services.rb

@@ -49,6 +49,7 @@ module Fastlane
           associated_domains: 'associated_domains',
           auto_fill_credential: 'auto_fill_credential',
           class_kit: 'class_kit',
+          declared_age_range: 'declared_age_range',
           icloud: 'icloud',
           custom_network_protocol: 'custom_network_protocol',
           data_protection: 'data_protection',

data/fastlane/lib/fastlane/actions/notarize.rb

@@ -74,7 +74,7 @@ module Fastlane
         ] + auth_parts
 
         if verbose
-          submit_command << "--verbose"
+          submit_parts << "--verbose"
         end
 
         submit_command = submit_parts.join(' ')

data/fastlane/lib/fastlane/actions/upload_to_app_store.rb

@@ -49,7 +49,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        [:ios, :mac, :xros].include?(platform)
       end
 
       def self.example_code

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

@@ -20,7 +20,7 @@ module Fastlane
       def self.details
         [
           "Create nice code coverage reports and post coverage summaries on Slack *(xcov gem is required)*.",
-          "More information: [https://github.com/nakiostudio/xcov](https://github.com/nakiostudio/xcov)."
+          "More information: [https://github.com/fastlane-community/xcov](https://github.com/fastlane-community/xcov)."
         ].join("\n")
       end
 
@@ -31,12 +31,6 @@ module Fastlane
       def self.available_options
         return [] unless Helper.mac?
 
-        # We call Gem::Specification.find_by_name in many more places than this, but for right now
-        # this is the only place we're having trouble. If there are other reports about RubyGems
-        # 2.6.2 causing problems, we may need to move this code and require it someplace better,
-        # like fastlane_core
-        require 'fastlane/core_ext/bundler_monkey_patch'
-
         begin
           Gem::Specification.find_by_name('xcov')
         rescue Gem::LoadError

data/fastlane/lib/fastlane/cli_tools_distributor.rb

@@ -65,6 +65,15 @@ module Fastlane
           end
         end
 
+        # Ruby version warning
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new(Fastlane::SUGGESTED_MINIMUM_RUBY) && !FastlaneCore::Env.truthy?("FASTLANE_SKIP_RUBY_VERSION_WARNING")
+          warn = "WARNING: Support for your Ruby version (#{RUBY_VERSION}) is going away. fastlane will soon require Ruby #{Fastlane::SUGGESTED_MINIMUM_RUBY} or newer."
+          UI.important(warn)
+          at_exit do
+            UI.important(warn)
+          end
+        end
+
         # Needs to go after load_dot_env for variable FASTLANE_SKIP_UPDATE_CHECK
         FastlaneCore::UpdateChecker.start_looking_for_update('fastlane')
 
@@ -123,7 +132,16 @@ module Fastlane
           Fastlane::CommandsGenerator.start
         end
       ensure
-        FastlaneCore::UpdateChecker.show_update_status('fastlane', Fastlane::VERSION)
+        # If the ruby setup if broken, and UpdateChecker fails catastrophically,
+        # we don't want to hide the original exception. We just print it
+        # see https://github.com/fastlane/fastlane/issues/29916
+        begin
+          FastlaneCore::UpdateChecker.show_update_status('fastlane', Fastlane::VERSION)
+        # rubocop:disable Lint/RescueException
+        rescue Exception => e
+          UI.error(e.to_s)
+        end
+        # rubocop:enable Lint/RescueException
       end
 
       def map_aliased_tools(tool_name)

data/fastlane/lib/fastlane/console.rb

@@ -6,12 +6,12 @@ module Fastlane
     def self.execute(args, options)
       ARGV.clear
       IRB.setup(nil)
-      @irb = IRB::Irb.new(nil)
+      workspace = IRB::WorkSpace.new(binding)
+      @irb = IRB::Irb.new(workspace)
       IRB.conf[:MAIN_CONTEXT] = @irb.context
       IRB.conf[:PROMPT][:FASTLANE] = IRB.conf[:PROMPT][:SIMPLE].dup
       IRB.conf[:PROMPT][:FASTLANE][:RETURN] = "%s\n"
       @irb.context.prompt_mode = :FASTLANE
-      @irb.context.workspace = IRB::WorkSpace.new(binding)
       trap('INT') do
         @irb.signal_handle
       end

data/fastlane/lib/fastlane/documentation/markdown_docs_generator.rb

@@ -97,7 +97,7 @@ module Fastlane
       if File.exist?(custom_file_location)
         UI.verbose("Using custom md.erb file for action #{action.action_name}")
 
-        result = ERB.new(File.read(custom_file_location), 0, '-').result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
+        result = ERB.new(File.read(custom_file_location), trim_mode: '-').result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
 
         return result
       end
@@ -122,7 +122,7 @@ module Fastlane
         end
 
         template = File.join(Fastlane::ROOT, "lib/assets/ActionDetails.md.erb")
-        result = ERB.new(File.read(template), 0, '-').result(binding)
+        result = ERB.new(File.read(template), trim_mode: '-').result(binding)
 
         action_mds[action.action_name] = result
       end
@@ -139,7 +139,7 @@ module Fastlane
 
       # Generate actions.md
       template = File.join(Fastlane::ROOT, "lib/assets/Actions.md.erb")
-      result = ERB.new(File.read(template), 0, '-').result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
+      result = ERB.new(File.read(template), trim_mode: '-').result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
       File.write(File.join(docs_dir, "generated", "actions.md"), result)
 
       # Generate actions sub pages (e.g. generated/actions/slather.md, generated/actions/scan.md)
@@ -165,7 +165,7 @@ module Fastlane
         end
 
         template = File.join(Fastlane::ROOT, "lib/assets/ActionDetails.md.erb")
-        result = ERB.new(File.read(template), 0, '-').result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
+        result = ERB.new(File.read(template), trim_mode: '-').result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
 
         # Actions get placed in "generated/actions" directory
         file_name = File.join(generated_actions_dir, "#{action.action_name}.md")

data/fastlane/lib/fastlane/erb_template_helper.rb

@@ -26,13 +26,7 @@ module Fastlane
     end
 
     def render(template)
-      # From Ruby 2.6, ERB.new takes keyword arguments and positional ones are deprecated
-      # https://bugs.ruby-lang.org/issues/14256
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
-        ERB.new(template, trim_mode: @trim_mode).result(binding)
-      else
-        ERB.new(template, nil, @trim_mode).result(binding)
-      end
+      ERB.new(template, trim_mode: @trim_mode).result(binding)
     end
   end
 end

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

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir["lib/**/*"] + %w(README.md LICENSE)
   spec.require_paths = ['lib']
   spec.metadata['rubygems_mfa_required'] = 'true'
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   # Don't add a dependency to fastlane or fastlane_re
   # since this would cause a circular dependency