fastlane 2.236.1 → 2.238.0

data/fastlane_core/lib/fastlane_core/analytics/analytics_ingester_client.rb

@@ -34,21 +34,33 @@ module FastlaneCore
 
     def post_request(event)
       connection = Faraday.new(GA_URL) do |conn|
-        conn.request(:url_encoded)
+        # This request runs while fastlane is shutting down,
+        # so keep the timeouts short to not delay the user
+        conn.options.open_timeout = 5
+        conn.options.timeout = 5
         conn.adapter(Faraday.default_adapter)
       end
       connection.headers[:user_agent] = 'fastlane/' + Fastlane::VERSION
-      connection.post("/collect", {
-        v: "1",                                            # API Version
-        tid: @ga_tracking,                                 # Tracking ID / Property ID
-        cid: event[:client_id],                            # Client ID
-        t: "event",                                        # Event hit type
-        ec: event[:category],                              # Event category
-        ea: event[:action],                                # Event action
-        el: event[:label] || "na",                         # Event label
-        ev: event[:value] || "0",                          # Event value
-        aip: "1"                                           # IP anonymization
-      })
+
+      # GA4 protocol, event parameters are sent as `ep.<name>` query parameters
+      params = {
+        v: "2",                        # Protocol version (GA4)
+        tid: @ga_tracking,             # GA4 measurement ID
+        cid: event[:client_id],        # Client ID
+        sid: event[:session_id],       # Session ID
+        _ss: "1",                      # Session start
+        seg: "1",                      # Session engaged
+        # Engagement time in ms, required for events to count towards active users
+        _et: (event[:engagement_time_msec] || 100).to_s,
+        en: event[:name].to_s          # Event name
+      }
+      (event[:params] || {}).each do |key, value|
+        params["ep.#{key}"] = value.to_s
+      end
+
+      connection.post("/g/collect") do |request|
+        request.params = params
+      end
     end
   end
 end

data/fastlane_core/lib/fastlane_core/analytics/analytics_session.rb

@@ -4,18 +4,20 @@ require_relative 'analytics_event_builder'
 
 module FastlaneCore
   class AnalyticsSession
-    GA_TRACKING = "UA-121171860-1"
+    GA_TRACKING = "G-94HQ3VVP0X"
 
     private_constant :GA_TRACKING
     attr_accessor :session_id
     attr_accessor :client
 
     def initialize(analytics_ingester_client: AnalyticsIngesterClient.new(GA_TRACKING))
-      require 'securerandom'
-      @session_id = SecureRandom.uuid
+      # GA4 requires a numeric session ID for events to be attributed to a session
+      @session_id = Time.now.to_i.to_s
+      @session_start_time = Time.now
       @client = analytics_ingester_client
       @threads = []
-      @launch_event_sent = false
+      @launch_event = nil
+      @launch_event_captured = false
     end
 
     def action_launched(launch_context: nil)
@@ -23,23 +25,22 @@ module FastlaneCore
         show_message
       end
 
-      if @launch_event_sent || launch_context.p_hash.nil?
+      if @launch_event_captured || launch_context.p_hash.nil?
         return
       end
 
-      @launch_event_sent = true
+      @launch_event_captured = true
       builder = AnalyticsEventBuilder.new(
         p_hash: launch_context.p_hash,
         session_id: session_id,
         action_name: nil,
-        fastlane_client_language: launch_context.fastlane_client_language
+        fastlane_client_language: launch_context.fastlane_client_language,
+        build_tool_version: launch_context.build_tool_version
       )
 
-      launch_event = builder.new_event(:launch)
-      post_thread = client.post_event(launch_event)
-      unless post_thread.nil?
-        @threads << post_thread
-      end
+      # The event is not posted until finalize_session, so that the
+      # run duration can be reported as GA4 engagement time
+      @launch_event = builder.new_event(:launch)
     end
 
     def action_completed(completion_context: nil)
@@ -64,6 +65,15 @@ module FastlaneCore
     end
 
     def finalize_session
+      unless @launch_event.nil?
+        @launch_event[:engagement_time_msec] = ((Time.now - @session_start_time) * 1000).round
+        post_thread = client.post_event(@launch_event)
+        unless post_thread.nil?
+          @threads << post_thread
+        end
+        @launch_event = nil
+      end
+
       @threads.map(&:join)
     end
   end

data/fastlane_core/lib/fastlane_core/cert_checker.rb

@@ -43,6 +43,15 @@ WWDRCA_CERTIFICATES = [
   }
 ]
 
+# Common names of the certificates in `WWDRCA_CERTIFICATES`. The WWDR
+# certificates (G2-G6) and the Developer ID certificates (DEV-ID-G1,
+# DEV-ID-G2) use different common names, so each of them has to be queried
+# separately when looking up the installed certificates
+WWDRCA_CERTIFICATE_NAMES = [
+  'Apple Worldwide Developer Relations',
+  'Developer ID Certification Authority'
+]
+
 module FastlaneCore
   # This class checks if a specific certificate is installed on the current mac
   class CertChecker
@@ -123,18 +132,21 @@ module FastlaneCore
     end
 
     def self.installed_wwdr_certificates(keychain: nil)
-      certificate_name = "Apple Worldwide Developer Relations"
       keychain ||= wwdr_keychain # backwards compatibility
 
-      # Find all installed WWDRCA certificates
+      # Find all installed WWDRCA certificates. A single `security
+      # find-certificate` call can only match one common name, so query the
+      # keychain once per common name used by the certificates
       installed_certs = []
-      Helper.backticks("security find-certificate -a -c '#{certificate_name}' -p #{keychain.shellescape}", print: false)
-            .lines
-            .each do |line|
-        if line.start_with?('-----BEGIN CERTIFICATE-----')
-          installed_certs << line
-        else
-          installed_certs.last << line
+      WWDRCA_CERTIFICATE_NAMES.each do |certificate_name|
+        Helper.backticks("security find-certificate -a -c '#{certificate_name}' -p #{keychain.shellescape}", print: false)
+              .lines
+              .each do |line|
+          if line.start_with?('-----BEGIN CERTIFICATE-----')
+            installed_certs << line
+          else
+            installed_certs.last << line
+          end
         end
       end
 
@@ -145,6 +157,7 @@ module FastlaneCore
           WWDRCA_CERTIFICATES.find { |c| c[:sha256].casecmp?(sha256) }&.fetch(:alias)
         end
         .compact
+        .uniq
     end
 
     def self.install_missing_wwdr_certificates(in_keychain: nil)

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -91,9 +91,10 @@ module FastlaneCore
     end
 
     def self.operating_system
-      return "macOS" if RUBY_PLATFORM.downcase.include?("darwin")
-      return "Windows" if RUBY_PLATFORM.downcase.include?("mswin")
-      return "Linux" if RUBY_PLATFORM.downcase.include?("linux")
+      return "macOS" if self.mac?
+      return "Windows" if self.windows?
+      return "Linux" if self.linux?
+      return "Java" if RUBY_PLATFORM =~ /java/
       return "Unknown"
     end
 

data/fastlane_core/lib/fastlane_core/ipa_upload_package_builder.rb

@@ -14,8 +14,12 @@ module FastlaneCore
 
     def generate(app_id: nil, ipa_path: nil, package_path: nil, platform: nil, app_identifier: nil, short_version: nil, bundle_version: nil)
       unless Helper.is_mac?
-        # .itmsp packages are not supported for ipa uploads starting Transporter 4.1, for non-macOS
-        self.package_path = package_path
+        # .itmsp packages are not supported for ipa uploads starting Transporter 4.1, for non-macOS.
+        # Use a unique subdirectory anyway: callers pass a shared parent (deliver passes "/tmp"),
+        # and ItunesTransporter#upload runs FileUtils.rm_rf on whatever this returns.
+        self.package_path = File.join(package_path, "#{app_id}-#{SecureRandom.uuid}")
+        FileUtils.mkdir_p(self.package_path)
+
         copy_ipa(ipa_path)
 
         # copy any AppStoreInfo.plist file that's next to the ipa file

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/pkg_upload_package_builder.rb

@@ -22,7 +22,7 @@ module FastlaneCore
         apple_id: app_id,
         file_size: File.size(pkg_path),
         ipa_path: File.basename(pkg_path), # this is only the base name as the ipa is inside the package
-        md5: Digest::MD5.hexdigest(File.read(pkg_path)),
+        md5: Digest::MD5.file(pkg_path).hexdigest,
         archive_type: 'product-archive',
         platform: platform
       }

data/fastlane_core/lib/fastlane_core/print_table.rb

@@ -1,22 +1,6 @@
 require_relative 'configuration/configuration'
 require_relative 'helper'
 
-# Monkey patch Terminal::Table until this is merged
-# https://github.com/tj/terminal-table/pull/131
-# solves https://github.com/fastlane/fastlane/issues/21852
-# loads Terminal::Table first to be able to monkey patch it.
-require 'terminal-table'
-module Terminal
-  class Table
-    class Cell
-      def lines
-        # @value.to_s.split(/\n/)
-        @value.to_s.encode("utf-8", invalid: :replace).split(/\n/)
-      end
-    end
-  end
-end
-
 module FastlaneCore
   class PrintTable
     class << self

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/queue_worker.rb

@@ -33,17 +33,26 @@ module FastlaneCore
       @queue.close
 
       threads = []
+      results = Queue.new
       @concurrency.times do
         threads << Thread.new do
+          # Exceptions are re-joined (and raised) below, so this just causes duplicate raised exceptions
+          Thread.current.report_on_exception = false
+
           job = @queue.pop
           while job
-            @block.call(job)
+            results << @block.call(job)
             job = @queue.pop
           end
         end
       end
 
       threads.each(&:join)
+
+      # Convert Queue to Array
+      real_results = []
+      real_results << results.pop until results.empty?
+      real_results
     end
   end
 end

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/fastlane_core/lib/fastlane_core/video_utils.rb

@@ -60,7 +60,9 @@ module FastlaneCore
       nil
     end
 
-    # Reads the moov box and returns [w, h] if found in any trak/tkhd, else nil.
+    # Reads the moov box and returns [w, h] from the first trak/tkhd with non-zero dimensions, else nil.
+    # Non-video tracks (e.g. audio) carry a legitimate tkhd width/height of 0x0,
+    # so zero-sized results are skipped to keep scanning for the video track.
     # Input: io (IO) positioned at moov contents; moov_end (Integer) absolute end offset.
     # Output: [width, height] or nil.
     def self.extract_resolution_from_moov(io, moov_end)
@@ -71,7 +73,7 @@ module FastlaneCore
         if atom_type == "trak"
           trak_end = io.pos + (atom_size - 8)
           resolution = extract_resolution_from_trak(io, trak_end)
-          return resolution if resolution
+          return resolution if resolution && resolution[0] > 0 && resolution[1] > 0
           io.seek(trak_end, IO::SEEK_SET)
         else
           skip(io, atom_size - 8)

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/gym/lib/gym/module.rb

@@ -56,11 +56,29 @@ module Gym
     end
 
     def building_mac_catalyst_for_ios?
-      Gym.project.supports_mac_catalyst? && Gym.config[:catalyst_platform] == "ios"
+      return false unless Gym.project.supports_mac_catalyst?
+
+      # If catalyst_platform is explicitly set, use it
+      if Gym.config[:catalyst_platform]
+        return Gym.config[:catalyst_platform] == "ios"
+      end
+
+      # If catalyst_platform is not set, use SDK to determine
+      # Mac Catalyst apps with iOS SDK build for iOS (IPA), not macOS
+      return Gym.config[:sdk] == "iphoneos" || Gym.config[:sdk] == "iphonesimulator"
     end
 
     def building_mac_catalyst_for_mac?
-      Gym.project.supports_mac_catalyst? && Gym.config[:catalyst_platform] == "macos"
+      return false unless Gym.project.supports_mac_catalyst?
+
+      # If catalyst_platform is explicitly set, use it
+      if Gym.config[:catalyst_platform]
+        return Gym.config[:catalyst_platform] == "macos"
+      end
+
+      # If catalyst_platform is not set, use SDK to determine
+      # Mac Catalyst apps with SDK macosx build for Mac (PKG), otherwise for iOS (IPA)
+      return Gym.config[:sdk] == "macosx"
     end
 
     def building_multiplatform_for_ios?

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/pilot/lib/pilot/build_manager.rb

@@ -172,7 +172,7 @@ module Pilot
       # Verify the build has all the includes that we need
       # and fetch a new build if not
       if build && (!build.app || !build.build_beta_detail || !build.pre_release_version)
-        UI.important("Build did include information for app, build beta detail and pre release version")
+        UI.important("Build did not include information for app, build beta detail and pre release version")
         UI.important("Fetching a new build with all the information needed")
         build = Spaceship::ConnectAPI::Build.get(build_id: build.id)
       end
@@ -459,7 +459,7 @@ module Pilot
       if options[:groups]
         app = uploaded_build.app
         beta_groups = app.get_beta_groups.select do |group|
-          options[:groups].include?(group.name)
+          group.matches_identifiers?(options[:groups])
         end
 
         unless beta_groups.empty?

data/pilot/lib/pilot/options.rb

@@ -267,7 +267,7 @@ module Pilot
         FastlaneCore::ConfigItem.new(key: :groups,
                                      short_option: "-g",
                                      env_name: "PILOT_GROUPS",
-                                     description: "Associate tester to one group or more by group name / group id. E.g. `-g \"Team 1\",\"Team 2\"` This is required when `distribute_external` option is set to true or when we want to add a tester to one or more external testing groups ",
+                                     description: "Associate tester to one group or more by group name / group id. E.g. `-g \"Team 1\",\"a06cf5b5-95a9-4beb-88c6-f22bd6b3f7a2\"` This is required when `distribute_external` option is set to true or when we want to add a tester to one or more external testing groups ",
                                      optional: true,
                                      type: Array,
                                      verify_block: proc do |value|
@@ -312,7 +312,7 @@ module Pilot
         # rubocop:disable Layout/LineLength
         FastlaneCore::ConfigItem.new(key: :itc_provider,
                                      env_name: "PILOT_ITC_PROVIDER",
-                                     description: "The provider short name to be used with the iTMSTransporter to identify your team. This value will override the automatically detected provider short name. To get provider short name run `pathToXcode.app/Contents/Applications/Application\\ Loader.app/Contents/itms/bin/iTMSTransporter -m provider -u 'USERNAME' -p 'PASSWORD' -account_type itunes_connect -v off`. The short names of providers should be listed in the second column",
+                                     description: "The provider short name to be used with the iTMSTransporter to identify your team. This value will override the automatically detected provider short name. To get provider short name run `xcrun iTMSTransporter -m provider -u 'USERNAME' -p 'PASSWORD' -account_type itunes_connect -v off`. The short names of providers should be listed in the second column",
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :provider_public_id,
                                      env_name: "PILOT_PROVIDER_PUBLIC_ID",

data/pilot/lib/pilot/tester_manager.rb

@@ -13,7 +13,7 @@ module Pilot
       UI.user_error!("You must provide 1 or more groups (with the `:groups` option)") unless groups_param
 
       app.get_beta_groups.select do |group|
-        next unless groups_param.include?(group.name)
+        next unless group.matches_identifiers?(groups_param)
         user = {
           email: config[:email],
           firstName: config[:first_name],
@@ -54,7 +54,7 @@ module Pilot
           UI.success("Successfully removed tester #{tester.email} from app: #{app.name}")
         else
           groups = tester.beta_groups.select do |group|
-            config[:groups].include?(group.name)
+            group.matches_identifiers?(config[:groups])
           end
           tester.delete_from_beta_groups(beta_groups: groups)
 

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

@@ -11,27 +11,33 @@ module Precheck
     end
 
     def self.friendly_name
-      "Incorrect, or missing copyright date"
+      "No incorrect or missing copyright date"
     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/precheck/lib/precheck/rules/unreachable_urls_rule.rb

@@ -1,5 +1,5 @@
 require 'addressable'
-require 'faraday_middleware'
+require 'faraday/follow_redirects'
 
 require_relative '../rule'
 
@@ -30,7 +30,7 @@ module Precheck
           uri = Addressable::URI.parse(url)
           uri.fragment = nil
           request = Faraday.new(uri.normalize.to_s) do |connection|
-            connection.use(FaradayMiddleware::FollowRedirects)
+            connection.response(:follow_redirects)
             connection.adapter(:net_http)
           end
           return RuleReturn.new(validation_state: Precheck::VALIDATION_STATES[:failed], failure_data: "HTTP #{request.head.status}: #{url}") unless request.head.status == 200

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?
       }