fastlane 2.236.1 → 2.237.0

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.236.1
+// Generated with fastlane 2.237.0

data/fastlane/swift/GymfileProtocol.swift

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

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.236.1
+// Generated with fastlane 2.237.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -134,6 +134,9 @@ public protocol MatchfileProtocol: AnyObject {
     /// Renew the provisioning profiles if the certificate count on the developer portal has changed. Works only for the 'development' provisioning profile type. Requires 'include_all_certificates' option to be 'true'
     var forceForNewCertificates: Bool { get }
 
+    /// Automatically renew expired certificates. Note: to renew `developer_id` and `developer_id_installer` certificates you must log in with the Account Holder account by using username and password; App Store Connect API key doesn't work in this case. The expired certificate is removed from the match storage and a new one is created, but the old certificate is not revoked on the Apple Developer Portal — run `fastlane match nuke` if you need to free up certificate slots
+    var renewExpiredCerts: Bool { get }
+
     /// Disables confirmation prompts during nuke, answering them with yes
     var skipConfirmation: Bool { get }
 
@@ -351,6 +354,10 @@ public extension MatchfileProtocol {
         return false
     }
 
+    var renewExpiredCerts: Bool {
+        return false
+    }
+
     var skipConfirmation: Bool {
         return false
     }
@@ -406,4 +413,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.147]
+// FastlaneRunnerAPIVersion [0.9.148]

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.236.1
+// Generated with fastlane 2.237.0

data/fastlane/swift/PrecheckfileProtocol.swift

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

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.236.1
+// Generated with fastlane 2.237.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -107,6 +107,9 @@ public protocol ScanfileProtocol: AnyObject {
     /// Remove retry attempts from test results table and the JUnit report (if not using xcpretty)
     var outputRemoveRetryAttempts: Bool { get }
 
+    /// Force the use of the '--legacy' flag for xcresulttool instead of using the new commands
+    var forceLegacyXcresulttool: Bool { get }
+
     /// **DEPRECATED!** Use `output_style: 'raw'` instead - Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table
     var disableXcpretty: Bool? { get }
 
@@ -387,6 +390,10 @@ public extension ScanfileProtocol {
         return false
     }
 
+    var forceLegacyXcresulttool: Bool {
+        return false
+    }
+
     var disableXcpretty: Bool? {
         return nil
     }
@@ -574,4 +581,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.158]
+// FastlaneRunnerAPIVersion [0.9.159]

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.236.1
+// Generated with fastlane 2.237.0

data/fastlane/swift/ScreengrabfileProtocol.swift

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

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.236.1
+// Generated with fastlane 2.237.0

data/fastlane/swift/SnapshotfileProtocol.swift

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

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -404,6 +404,8 @@ module FastlaneCore
     private
 
     def file_upload_option(source)
+      # altool's --upload-app and --validate-app only support the -f flag,
+      # unlike iTMSTransporter which requires -assetFile for .ipa/.pkg since 2026.
       "-f #{source.shellescape}"
     end
 
@@ -482,7 +484,7 @@ module FastlaneCore
         '"' + Helper.transporter_path + '"',
         '-m verify',
         build_credential_params(username, password, jwt),
-        "-f #{source.shellescape}",
+        file_upload_option(source),
         ("-WONoPause true" if Helper.windows?), # Windows only: process instantly returns instead of waiting for key press
         ("-itc_provider #{provider_short_name}" if jwt.nil? && !provider_short_name.to_s.empty?)
       ].compact.join(' ')

data/fastlane_core/lib/fastlane_core/keychain_importer.rb

@@ -10,7 +10,7 @@ module FastlaneCore
       password_part = " -P #{certificate_password.shellescape}"
       certificate_format_part = certificate_format.to_s.strip.empty? ? "" : " -f #{certificate_format.shellescape}"
 
-      command = "security import #{path.shellescape} -k '#{keychain_path.shellescape}'"
+      command = "security import #{path.shellescape} -k #{keychain_path.shellescape}"
       command << password_part
       command << certificate_format_part
       command << " -T /usr/bin/codesign" # to not be asked for permission when running a tool like `gym` (before Sierra)

data/fastlane_core/lib/fastlane_core/project.rb

@@ -395,7 +395,9 @@ module FastlaneCore
       xcode_at_least_13 = FastlaneCore::Helper.xcode_at_least?("13")
       if xcode_at_least_13 && options[:destination]
         begin
-          destination_parameter = " " + "-destination #{options[:destination].shellescape}"
+          destination = options[:destination]
+          destination = destination.first if destination.kind_of?(Array)
+          destination_parameter = " " + "-destination #{destination.shellescape}"
         rescue => ex
           # xcodebuild command can continue without destination parameter, so
           # we really don't care about this exception if something goes wrong with shellescape

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_shell_error.rb

@@ -3,6 +3,12 @@ require_relative 'fastlane_exception'
 module FastlaneCore
   class Interface
     class FastlaneShellError < FastlaneException
+      attr_reader :show_github_issues
+
+      def initialize(options = {})
+        @show_github_issues = options[:show_github_issues].nil? ? false : options[:show_github_issues]
+      end
+
       def prefix
         '[SHELL_ERROR]'
       end

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -167,7 +167,7 @@ module Commander
         end
       rescue FastlaneCore::Interface::FastlaneCommonException => e # these are exceptions that we don't count as crashes
         display_user_error!(e, e.to_s)
-      rescue FastlaneCore::Interface::FastlaneError => e # user_error!
+      rescue FastlaneCore::Interface::FastlaneError, FastlaneCore::Interface::FastlaneShellError => e # user_error! or shell_error!
         rescue_fastlane_error(e)
       rescue Errno::ENOENT => e
         rescue_file_error(e)

data/gym/lib/gym/error_handler.rb

@@ -151,11 +151,21 @@ module Gym
         # `xcodebuild` doesn't properly mark lines as failure reason or important information
         # so we assume that the last few lines show the error message that's relevant
         # (at least that's what was correct during testing)
-        log_content = File.read(log_path).split("\n").last(5)
+        log_lines = File.read(log_path).split("\n")
+        log_content = log_lines.last(5)
         log_content.each do |row|
           UI.command_output(row)
         end
 
+        # If we didn't find the error in the last 5 lines, let's search for it
+        # This is specifically for errors that might be buried by subsequent warnings
+        last_5_lines = log_content.join("\n")
+        unless last_5_lines.include?("error:")
+          UI.verbose("Error not found in last 5 lines, searching for it in the log...")
+          error_line = log_lines.reverse.find { |l| l.include?("error:") }
+          UI.command_output(error_line) if error_line
+        end
+
         UI.message("")
         UI.error("⬆️  Check out the few lines of raw `xcodebuild` output above for potential hints on how to solve this error")
         UI.important("📋  For the complete and more detailed error log, check the full log at:")

data/gym/lib/gym/generators/build_command_generator.rb

@@ -119,6 +119,8 @@ module Gym
       end
 
       def pipe_xcpretty
+        UI.important("Using xcpretty can result in missing some build errors and is slower than the preferred xcbeautify. See https://docs.fastlane.tools/best-practices/xcodebuild-formatters/ for more information.")
+
         pipe = []
 
         formatter = Gym.config[:xcpretty_formatter]

data/match/lib/match/options.rb

@@ -297,6 +297,14 @@ module Match
                                      description: "Renew the provisioning profiles if the certificate count on the developer portal has changed. Works only for the 'development' provisioning profile type. Requires 'include_all_certificates' option to be 'true'",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :renew_expired_certs,
+                                     env_name: "MATCH_RENEW_EXPIRED_CERTS",
+                                     description: "Automatically renew expired certificates. Note: to renew `developer_id` and `developer_id_installer` certificates " \
+                                                  "you must log in with the Account Holder account by using username and password; App Store Connect API key doesn't work in this case. " \
+                                                  "The expired certificate is removed from the match storage and a new one is created, but the old certificate is not revoked on the " \
+                                                  "Apple Developer Portal — run `fastlane match nuke` if you need to free up certificate slots",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_confirmation,
                                      env_name: "MATCH_SKIP_CONFIRMATION",
                                      description: "Disables confirmation prompts during nuke, answering them with yes",

data/match/lib/match/runner.rb

@@ -85,12 +85,12 @@ module Match
       end
 
       # Certificate
-      cert_id = fetch_certificate(params: params, renew_expired_certs: false)
+      cert_id = fetch_certificate(params: params, renew_expired_certs: params[:renew_expired_certs])
 
       # Mac Installer Distribution Certificate
       additional_cert_types = params[:additional_cert_types] || []
       cert_ids = additional_cert_types.map do |additional_cert_type|
-        fetch_certificate(params: params, renew_expired_certs: false, specific_cert_type: additional_cert_type)
+        fetch_certificate(params: params, renew_expired_certs: params[:renew_expired_certs], specific_cert_type: additional_cert_type)
       end
 
       profile_type = Sigh.profile_type_for_distribution_type(
@@ -174,6 +174,8 @@ module Match
       is_cert_renewable = is_authenticated_with_login || is_cert_renewable_via_api
 
       # Validate existing certificate first.
+      # NOTE: only a single certificate is considered here — the one matching
+      # `certificate_id`, or otherwise the last one found for this type.
       if renew_expired_certs && is_cert_renewable && storage_has_certs && !params[:readonly]
         cert_path = select_cert_or_key(paths: certs, certificate_id: certificate_id)
 

data/match/lib/match/storage/git_storage.rb

@@ -111,7 +111,7 @@ module Match
 
         begin
           # GIT_TERMINAL_PROMPT will fail the `git clone` command if user credentials are missing
-          Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
+          Helper.with_env_values(git_env_values) do
             FastlaneCore::CommandExecutor.execute(command: command,
                                                 print_all: FastlaneCore::Globals.verbose?,
                                             print_command: FastlaneCore::Globals.verbose?)
@@ -252,7 +252,7 @@ module Match
         commands << git_push_command
 
         UI.message("Pushing changes to remote git repo...")
-        Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
+        Helper.with_env_values(git_env_values) do
           commands.each do |command|
             FastlaneCore::CommandExecutor.execute(command: command,
                                                 print_all: FastlaneCore::Globals.verbose?,
@@ -263,6 +263,22 @@ module Match
         UI.error("Couldn't commit or push changes back to git...")
         UI.error(ex)
       end
+
+      def git_env_values
+        env_values = { 'GIT_TERMINAL_PROMPT' => '0' }
+        env_values['GIT_SSH_COMMAND'] = non_interactive_git_ssh_command
+        env_values
+      end
+
+      def non_interactive_git_ssh_command
+        ssh_command = ENV['GIT_SSH_COMMAND']
+
+        if ssh_command.nil? || ssh_command.empty?
+          return "ssh -o BatchMode=yes"
+        end
+        return ssh_command if ssh_command.include?('BatchMode=yes')
+        "#{ssh_command} -o BatchMode=yes"
+      end
     end
   end
 end

data/precheck/lib/precheck/rules/copyright_date_rule.rb

@@ -15,23 +15,29 @@ module Precheck
     end
 
     def self.description
-      "using a copyright date that is any different from this current year, or missing a date"
-    end
-
-    def pass_if_empty?
-      return false
+      "using a copyright year in the future, or missing a copyright year"
     end
 
     def supported_fields_symbol_set
       [:copyright].to_set
     end
 
-    def word_search_type
-      WORD_SEARCH_TYPES[:fail_on_exclusion]
+    def rule_block
+      return lambda { |text|
+        year = copyright_year(text)
+        if year.nil?
+          RuleReturn.new(validation_state: VALIDATION_STATES[:failed], failure_data: "missing copyright year")
+        elsif year > DateTime.now.year
+          RuleReturn.new(validation_state: VALIDATION_STATES[:failed], failure_data: "copyright year is in the future: #{year}")
+        else
+          RuleReturn.new(validation_state: VALIDATION_STATES[:passed])
+        end
+      }
     end
 
-    def lowercased_words_to_look_for
-      [DateTime.now.year.to_s]
+    def copyright_year(text)
+      match = text.to_s.match(/\b(?:19|20)\d{2}\b/)
+      match && match[0].to_i
     end
   end
 end

data/scan/lib/scan/options.rb

@@ -273,6 +273,11 @@ module Scan
                                      description: "Remove retry attempts from test results table and the JUnit report (if not using xcpretty)",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :force_legacy_xcresulttool,
+                                     env_names: ["SCAN_FORCE_LEGACY_XCRESULTTOOL", "TRAINER_FORCE_LEGACY_XCRESULTTOOL"],
+                                     description: "Force the use of the '--legacy' flag for xcresulttool instead of using the new commands",
+                                     type: Boolean,
+                                     default_value: false),
 
         # xcpretty
         FastlaneCore::ConfigItem.new(key: :disable_xcpretty,

data/scan/lib/scan/runner.rb

@@ -216,6 +216,7 @@ module Scan
       params = {
         path: result_bundle_path,
         output_remove_retry_attempts: Scan.config[:output_remove_retry_attempts],
+        force_legacy_xcresulttool: Scan.config[:force_legacy_xcresulttool],
         silent: !FastlaneCore::Globals.verbose?
       }
 

data/scan/lib/scan/test_command_generator.rb

@@ -177,6 +177,8 @@ module Scan
     end
 
     def pipe_xcpretty
+      UI.important("Using xcpretty can result in missing some build errors and is slower than the preferred xcbeautify. See https://docs.fastlane.tools/best-practices/xcodebuild-formatters/ for more information.")
+
       formatter = []
       if (custom_formatter = Scan.config[:xcpretty_formatter] || Scan.config[:formatter])
         if custom_formatter.end_with?(".rb")

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -717,9 +717,9 @@ module Spaceship
               type: "appInfoLocalizations",
               attributes: attributes,
               relationships: {
-                appStoreVersion: {
+                appInfo: {
                   data: {
-                    type: "appStoreVersions",
+                    type: "appInfos",
                     id: app_info_id
                   }
                 }
@@ -742,6 +742,11 @@ module Spaceship
           tunes_request_client.patch("#{Version::V1}/appInfoLocalizations/#{app_info_localization_id}", body)
         end
 
+        def delete_app_info_localization(app_info_localization_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("#{Version::V1}/appInfoLocalizations/#{app_info_localization_id}", params)
+        end
+
         #
         # appStoreReviewDetails
         #

data/supply/lib/supply/uploader.rb

@@ -19,9 +19,15 @@ module Supply
 
       track_to_update = Supply.config[:track]
 
+      # Capture whether any new binaries were actually uploaded before appending
+      # version_codes_to_retain. The branch below uses this flag so that retained
+      # codes do not cause a promote-only run to take the upload path.
+      # See: https://github.com/fastlane/fastlane/issues/29984
+      uploading_new_binaries = !apk_version_codes.empty?
+
       apk_version_codes.concat(Supply.config[:version_codes_to_retain]) if Supply.config[:version_codes_to_retain]
 
-      if !apk_version_codes.empty?
+      if uploading_new_binaries
         # Only update tracks if we have version codes
         # update_track handle setting rollout if needed
         # Updating a track with empty version codes can completely clear out a track

data/trainer/lib/trainer/xcresult/test_case.rb

@@ -115,11 +115,30 @@ module Trainer
         @retries&.count || 0
       end
 
-      def total_tests_count
+      # Result of the final attempt (last repetition), or the overall result when there are no retries.
+      # When retry attempts are removed, counts should reflect this final outcome rather than the
+      # aggregate `@result`, which xcresulttool reports as `Failed` even if the test was skipped on retry.
+      def final_result
+        @retries && !@retries.empty? ? @retries.last.result : @result
+      end
+
+      def final_failed?
+        final_result == 'Failed'
+      end
+
+      def final_skipped?
+        final_result == 'Skipped'
+      end
+
+      def total_tests_count(output_remove_retry_attempts: false)
+        return 1 if output_remove_retry_attempts
+
         retries_count > 0 ? retries_count : 1
       end
 
-      def total_failures_count
+      def total_failures_count(output_remove_retry_attempts: false)
+        return final_failed? ? 1 : 0 if output_remove_retry_attempts
+
         if retries_count > 0
           @retries.count(&:failed?)
         elsif failed?

data/trainer/lib/trainer/xcresult/test_plan.rb

@@ -40,7 +40,7 @@ module Trainer
       # Allows iteration over test suites. Used by TestParser to collect test results
       include Enumerable
       def each(&block)
-        test_suites.map(&:to_hash).each(&block)
+        test_suites.map { |suite| suite.to_hash(output_remove_retry_attempts: output_remove_retry_attempts) }.each(&block)
       end
 
       # Generates a JUnit-compatible XML representation of the test plan
@@ -49,8 +49,8 @@ module Trainer
         # Create the root testsuites element with calculated summary attributes
         testsuites = Helper.create_xml_element('testsuites',
           tests: test_suites.sum(&:test_cases_count).to_s,
-          failures: test_suites.sum(&:failures_count).to_s,
-          skipped: test_suites.sum(&:skipped_count).to_s,
+          failures: test_suites.sum { |suite| suite.failures_count(output_remove_retry_attempts: output_remove_retry_attempts) }.to_s,
+          skipped: test_suites.sum { |suite| suite.skipped_count(output_remove_retry_attempts: output_remove_retry_attempts) }.to_s,
           time: test_suites.sum(&:duration).to_s)
 
         # Create <properties> node for configuration and device, to be applied to each suite node

data/trainer/lib/trainer/xcresult/test_suite.rb

@@ -58,38 +58,47 @@ module Trainer
         @test_cases_count ||= @test_cases.count + @sub_suites.sum(&:test_cases_count)
       end
 
-      def failures_count
-        @failures_count ||= @test_cases.count(&:failed?) + @sub_suites.sum(&:failures_count)
+      # When output_remove_retry_attempts is true, counts reflect each test case's final attempt
+      # only (matching the trimmed JUnit output), so a test that failed then was skipped on retry
+      # is no longer counted as a failure.
+      def failures_count(output_remove_retry_attempts: false)
+        predicate = output_remove_retry_attempts ? :final_failed? : :failed?
+        @test_cases.count(&predicate) +
+          @sub_suites.sum { |suite| suite.failures_count(output_remove_retry_attempts: output_remove_retry_attempts) }
       end
 
-      def skipped_count
-        @skipped_count ||= @test_cases.count(&:skipped?) + @sub_suites.sum(&:skipped_count)
+      def skipped_count(output_remove_retry_attempts: false)
+        predicate = output_remove_retry_attempts ? :final_skipped? : :skipped?
+        @test_cases.count(&predicate) +
+          @sub_suites.sum { |suite| suite.skipped_count(output_remove_retry_attempts: output_remove_retry_attempts) }
       end
 
-      def total_tests_count
-        @test_cases.sum(&:total_tests_count) +
-          @sub_suites.sum(&:total_tests_count)
+      def total_tests_count(output_remove_retry_attempts: false)
+        @test_cases.sum { |test_case| test_case.total_tests_count(output_remove_retry_attempts: output_remove_retry_attempts) } +
+          @sub_suites.sum { |suite| suite.total_tests_count(output_remove_retry_attempts: output_remove_retry_attempts) }
       end
 
-      def total_failures_count
-        @test_cases.sum(&:total_failures_count) +
-          @sub_suites.sum(&:total_failures_count)
+      def total_failures_count(output_remove_retry_attempts: false)
+        @test_cases.sum { |test_case| test_case.total_failures_count(output_remove_retry_attempts: output_remove_retry_attempts) } +
+          @sub_suites.sum { |suite| suite.total_failures_count(output_remove_retry_attempts: output_remove_retry_attempts) }
       end
 
-      def total_retries_count
+      def total_retries_count(output_remove_retry_attempts: false)
+        return 0 if output_remove_retry_attempts
+
         @test_cases.sum(&:retries_count) +
           @sub_suites.sum(&:total_retries_count)
       end
 
       # Hash representation used by TestParser to collect test results
-      def to_hash
+      def to_hash(output_remove_retry_attempts: false)
         {
-          number_of_tests: total_tests_count,
-          number_of_failures: total_failures_count,
+          number_of_tests: total_tests_count(output_remove_retry_attempts: output_remove_retry_attempts),
+          number_of_failures: total_failures_count(output_remove_retry_attempts: output_remove_retry_attempts),
           number_of_tests_excluding_retries: test_cases_count,
-          number_of_failures_excluding_retries: failures_count,
-          number_of_retries: total_retries_count,
-          number_of_skipped: skipped_count
+          number_of_failures_excluding_retries: failures_count(output_remove_retry_attempts: output_remove_retry_attempts),
+          number_of_retries: total_retries_count(output_remove_retry_attempts: output_remove_retry_attempts),
+          number_of_skipped: skipped_count(output_remove_retry_attempts: output_remove_retry_attempts)
         }
       end
 
@@ -100,8 +109,8 @@ module Trainer
           name: @name,
           time: duration.to_s,
           tests: test_cases_count.to_s,
-          failures: failures_count.to_s,
-          skipped: skipped_count.to_s)
+          failures: failures_count(output_remove_retry_attempts: output_remove_retry_attempts).to_s,
+          skipped: skipped_count(output_remove_retry_attempts: output_remove_retry_attempts).to_s)
 
         # Add test cases
         @test_cases.each do |test_case|