fastlane 2.237.0 → 2.239.0

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.237.0
+// Generated with fastlane 2.239.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.143]
+// FastlaneRunnerAPIVersion [0.9.145]

data/fastlane_core/lib/fastlane_core/analytics/analytics_event_builder.rb

@@ -1,23 +1,49 @@
+require_relative '../helper'
+
 module FastlaneCore
   class AnalyticsEventBuilder
     attr_accessor :action_name
 
     # fastlane_client_language valid options are :ruby or :swift
-    def initialize(p_hash: nil, session_id: nil, action_name: nil, fastlane_client_language: :ruby)
+    def initialize(p_hash: nil, session_id: nil, action_name: nil, fastlane_client_language: :ruby, build_tool_version: nil)
       @p_hash = p_hash
       @session_id = session_id
       @action_name = action_name
       @fastlane_client_language = fastlane_client_language
+      @build_tool_version = build_tool_version
     end
 
     def new_event(action_stage)
       {
         client_id: @p_hash,
-        category: "fastlane Client Language - #{@fastlane_client_language}",
-        action: action_stage,
-        label: action_name,
-        value: nil
+        session_id: @session_id,
+        name: action_stage,
+        params: {
+          fastlane_client_language: @fastlane_client_language,
+          fastlane_version: Fastlane::VERSION,
+          install_method: install_method,
+          ruby_version: RUBY_VERSION,
+          operating_system: Helper.operating_system,
+          build_tool_version: @build_tool_version,
+          ci: Helper.ci?.to_s
+        }.reject { |_, value| value.nil? }
       }
     end
+
+    private
+
+    def install_method
+      if Helper.bundler?
+        'bundler'
+      elsif Helper.contained_fastlane?
+        'standalone'
+      elsif Helper.homebrew?
+        'homebrew'
+      elsif Helper.mac_app?
+        'mac_app'
+      else
+        'gem'
+      end
+    end
   end
 end

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

@@ -341,9 +341,9 @@ module Match
     def filter_profiles_and_files_by_selected_certificates
       # Do profile selection logic
       cert_ids = self.certs.map { |cert| cert.id.to_s }
-      self.profiles = self.profiles.reject do |profile|
+      self.profiles = self.profiles.select do |profile|
         profile_cert_ids = profile.certificates.map { |cert| cert.id.to_s }
-        (cert_ids & profile_cert_ids).empty?
+        cert_ids.intersect?(profile_cert_ids)
       end
 
       profile_uuids = self.profiles.map do |profile|

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

@@ -117,13 +117,10 @@ module Match
                                             print_command: FastlaneCore::Globals.verbose?)
           end
         rescue
-          UI.error("Error cloning certificates repo, please make sure you have read access to the repository you want to use")
           if self.branch && self.clone_branch_directly
             UI.error("You passed '#{self.branch}' as branch in combination with the `clone_branch_directly` flag. Please remove `clone_branch_directly` flag on the first run for _match_ to create the branch.")
           end
-          UI.error("Run the following command manually to make sure you're properly authenticated:")
-          UI.command(command)
-          UI.user_error!("Error cloning certificates git repo, please make sure you have access to the repository - see instructions above")
+          UI.user_error!("Error cloning certificates repo, please make sure you have read access to the repository you want to use")
         end
 
         add_user_config(self.git_full_name, self.git_user_email)

data/match/lib/match/storage/google_cloud_storage.rb

@@ -82,7 +82,12 @@ module Match
         if self.google_cloud_keys_file.to_s.length > 0
           # Extract the Project ID from the `JSON` file
           # so the user doesn't have to provide it manually
-          keys_file_content = JSON.parse(File.read(self.google_cloud_keys_file))
+          begin
+            keys_file_content = JSON.parse(File.read(self.google_cloud_keys_file))
+          rescue JSON::ParserError
+            # Don't dump secret into logs in case a secret (p8) is passed. See fastlane/fastlane#21017
+            UI.user_error!("Provided keys file on path #{File.expand_path(self.google_cloud_keys_file)} is not a valid JSON file")
+          end
           if google_cloud_project_id.to_s.length > 0 && google_cloud_project_id != keys_file_content["project_id"]
             UI.important("The google_cloud_keys_file's project ID ('#{keys_file_content['project_id']}') doesn't match the google_cloud_project_id ('#{google_cloud_project_id}'). This may be the wrong keys file.")
           end

data/pem/lib/pem/manager.rb

@@ -20,7 +20,7 @@ module PEM
           remaining_days = (existing_certificate.expires - Time.now) / 60 / 60 / 24
 
           display_platform = ''
-          unless PEM.config[:website_push]
+          unless PEM.config[:website_push] || PEM.config[:voip_push]
             display_platform = "#{PEM.config[:platform]} "
           end
 
@@ -94,6 +94,8 @@ module PEM
       def certificate
         if PEM.config[:website_push]
           Spaceship.certificate.website_push
+        elsif PEM.config[:voip_push]
+          Spaceship.certificate.voip_push
         else
           platform = PEM.config[:platform]
           UI.user_error!('platform parameter is unspecified.') unless platform
@@ -123,6 +125,8 @@ module PEM
           'development'
         elsif PEM.config[:website_push]
           'website'
+        elsif PEM.config[:voip_push]
+          'voip'
         else
           'production'
         end

data/pem/lib/pem/options.rb

@@ -30,6 +30,12 @@ module PEM
                                      is_string: false,
                                      conflicting_options: [:development],
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :voip_push,
+                                     env_name: "PEM_VOIP_PUSH",
+                                     description: "Create a VoIP Services certificate",
+                                     is_string: false,
+                                     conflicting_options: [:development, :website_push],
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :generate_p12,
                                      env_name: "PEM_GENERATE_P12_FILE",
                                      description: "Generate a p12 file additionally to a PEM file",

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
@@ -296,6 +296,9 @@ module Pilot
 
       # Handle beta app clip invocations
       update_app_clip_invocations(options: options, build: build)
+
+      # Handle routing app coverage file
+      update_routing_app_coverage(options)
     end
 
     def self.truncate_changelog(changelog)
@@ -459,7 +462,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?
@@ -679,6 +682,35 @@ module Pilot
         end
       end
     end
+
+    def update_routing_app_coverage(options)
+      # Skip logic entirely if no coverage file passed. So status-quo stays the same.
+      return unless options[:routing_app_coverage_file]
+
+      # We can only attach a coverage file to build upload - so pick the most recent edit.
+      platform = Spaceship::ConnectAPI::Platform.map(fetch_app_platform)
+      version = app.get_edit_app_store_version(platform: platform)
+      unless version
+        UI.important("Skipping upload of routing app coverage file - could not find an editable app store version")
+        return
+      end
+
+      routing_app_coverage =
+        begin
+          version.fetch_routing_app_coverage
+        rescue => error
+          UI.important("Error fetching routing app coverage - #{error.message}")
+          nil
+        end
+
+      if routing_app_coverage
+        UI.message("Removing previous routing app coverage file from App Store Connect")
+        routing_app_coverage.delete!
+      end
+
+      UI.message("Uploading routing app coverage file to App Store Connect")
+      version.upload_routing_app_coverage(path: options[:routing_app_coverage_file])
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end

data/pilot/lib/pilot/options.rb

@@ -201,6 +201,14 @@ module Pilot
                                      optional: true,
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :routing_app_coverage_file,
+                                     env_name: "PILOT_ROUTING_APP_COVERAGE_FILE",
+                                     description: "Path to the routing app coverage file (`.geojson`) that is required for routing apps. It will be uploaded to the editable App Store version of the app",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Could not find routing app coverage file at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                       UI.user_error!("Routing app coverage file must be a .geojson file") unless File.extname(value).casecmp(".geojson").zero?
+                                     end),
 
         # distribution
         FastlaneCore::ConfigItem.new(key: :distribute_only,
@@ -267,7 +275,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 +320,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,7 +11,7 @@ module Precheck
     end
 
     def self.friendly_name
-      "Incorrect, or missing copyright date"
+      "No incorrect or missing copyright date"
     end
 
     def self.description

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