fastlane 2.213.0 → 2.215.0

data/fastlane/swift/formatting/Brewfile.lock.json

@@ -2,45 +2,55 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.51.9",
+        "version": "0.52.3",
         "bottle": {
           "rebuild": 0,
           "root_url": "https://ghcr.io/v2/homebrew/core",
           "files": {
+            "arm64_sonoma": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:a5ea23d7a08c20b20981a23f1ebc3221ca5796408934c412c2518598e00eb50f",
+              "sha256": "a5ea23d7a08c20b20981a23f1ebc3221ca5796408934c412c2518598e00eb50f"
+            },
             "arm64_ventura": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:bbb01c5c7fcde4f8b17945c2c8386b099848c9cd4fda8bcfd032c2420d5d1b65",
-              "sha256": "bbb01c5c7fcde4f8b17945c2c8386b099848c9cd4fda8bcfd032c2420d5d1b65"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:4c60e18bc44c0781d97a96c536aa8bb6e762b79008927c5e7307dcf2c69b6058",
+              "sha256": "4c60e18bc44c0781d97a96c536aa8bb6e762b79008927c5e7307dcf2c69b6058"
             },
             "arm64_monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:f04596d4567e86f46e0740ea3e9d1e2e19fa1cdf137a70287342b6ce937ddf8d",
-              "sha256": "f04596d4567e86f46e0740ea3e9d1e2e19fa1cdf137a70287342b6ce937ddf8d"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d63d1affcfba1ea8b6bf035d4abd834bf2effe0c0cf385ba608f98341da1c837",
+              "sha256": "d63d1affcfba1ea8b6bf035d4abd834bf2effe0c0cf385ba608f98341da1c837"
             },
             "arm64_big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d8b6f0f30662dd4c2e1eb64d614fe2765ad664e2ac10a346004f94ed6ed6cdf2",
-              "sha256": "d8b6f0f30662dd4c2e1eb64d614fe2765ad664e2ac10a346004f94ed6ed6cdf2"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d80ec81a9140159181b77145d2dfdcd38488b23b262ef1bd74ab7163d0cbebae",
+              "sha256": "d80ec81a9140159181b77145d2dfdcd38488b23b262ef1bd74ab7163d0cbebae"
+            },
+            "sonoma": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:1aa6efde9ecda9e98c1b852192e0230b2e84055861382660e93c50e59a80487f",
+              "sha256": "1aa6efde9ecda9e98c1b852192e0230b2e84055861382660e93c50e59a80487f"
             },
             "ventura": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:dc2be8c829dc26595577f8b5daa071324f341c4f144cc46bf0a47520d44fc76e",
-              "sha256": "dc2be8c829dc26595577f8b5daa071324f341c4f144cc46bf0a47520d44fc76e"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:274da364741558f1f52780e9a92354db212a803cf5d84c2ca9ff632d94ada47d",
+              "sha256": "274da364741558f1f52780e9a92354db212a803cf5d84c2ca9ff632d94ada47d"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:a88b992a2316fa06dd13944c6bb16d00522de0cc21aae17ede07e65d700c6800",
-              "sha256": "a88b992a2316fa06dd13944c6bb16d00522de0cc21aae17ede07e65d700c6800"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:b53d82e6f2d42bf1e6fa799983fdfae934b483bc916c34436184fcb7e407f896",
+              "sha256": "b53d82e6f2d42bf1e6fa799983fdfae934b483bc916c34436184fcb7e407f896"
             },
             "big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ba2cf56b5845bb33265a3e32737c5defa6e310987f785e1dfe6e7dc114a12555",
-              "sha256": "ba2cf56b5845bb33265a3e32737c5defa6e310987f785e1dfe6e7dc114a12555"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:9bd117c9e2f92bde0f59a4106748a56e57687a1716627ef601e63b15a383ea35",
+              "sha256": "9bd117c9e2f92bde0f59a4106748a56e57687a1716627ef601e63b15a383ea35"
             },
             "x86_64_linux": {
               "cellar": "/home/linuxbrew/.linuxbrew/Cellar",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d1f82ed96ee9f8f239e9396bff00a0feac937fe12840d05fb6d5c01fe9161f03",
-              "sha256": "d1f82ed96ee9f8f239e9396bff00a0feac937fe12840d05fb6d5c01fe9161f03"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:384fee82f88b4bf8b30cfe9cec946ebd9127a4741b28e06cec42fc0d9b70c0f6",
+              "sha256": "384fee82f88b4bf8b30cfe9cec946ebd9127a4741b28e06cec42fc0d9b70c0f6"
             }
           }
         }
@@ -74,12 +84,12 @@
         "macOS": "12.5"
       },
       "ventura": {
-        "HOMEBREW_VERSION": "4.0.18-59-gf7b3225",
+        "HOMEBREW_VERSION": "4.1.11-36-g184efd9",
         "HOMEBREW_PREFIX": "/opt/homebrew",
         "Homebrew/homebrew-core": "api",
         "CLT": "",
-        "Xcode": "14.1",
-        "macOS": "13.2.1"
+        "Xcode": "14.3",
+        "macOS": "13.4"
       }
     }
   }

data/fastlane_core/lib/fastlane_core/cert_checker.rb

@@ -146,7 +146,7 @@ module FastlaneCore
 
     def self.install_wwdr_certificate(cert_alias)
       url = WWDRCA_CERTIFICATES.find { |c| c[:alias] == cert_alias }.fetch(:url)
-      file = Tempfile.new(File.basename(url))
+      file = Tempfile.new([File.basename(url, ".cer"), ".cer"])
       filename = file.path
       keychain = wwdr_keychain
       keychain = "-k #{keychain.shellescape}" unless keychain.empty?

data/frameit/lib/frameit/device_types.rb

@@ -120,7 +120,7 @@ module Frameit
     IPHONE_8_PLUS ||= Frameit::Device.new("iphone-8-plus", "Apple iPhone 8 Plus", 6, [[1242, 2208], [2208, 1242]], 401, Color::SPACE_GRAY)
     IPHONE_X ||= Frameit::Device.new("iphone-X", "Apple iPhone X", 7, [[1125, 2436], [2436, 1125]], 458, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_58, :use_legacy_iphonex)
     IPHONE_XS ||= Frameit::Device.new("iphone-XS", "Apple iPhone XS", 8, [[1125, 2436], [2436, 1125]], 458, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_58, :use_legacy_iphonexs)
-    IPHONE_XR ||= Frameit::Device.new("iphone-XR", "Apple iPhone XR", 8, [[828, 1792], [1792, 828]], 326, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_61, :use_legacy_iphonexr)
+    IPHONE_XR ||= Frameit::Device.new("iphone-XR", "Apple iPhone XR", 8, [[828, 1792], [1792, 828]], 326, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_65, :use_legacy_iphonexsmax)
     IPHONE_XS_MAX ||= Frameit::Device.new("iphone-XS-Max", "Apple iPhone XS Max", 8, [[1242, 2688], [2688, 1242]], 458, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_65, :use_legacy_iphonexsmax)
     IPHONE_11 ||= Frameit::Device.new("iphone-11", "Apple iPhone 11", 9, [[828, 1792], [1792, 828]], 326, Color::BLACK, Platform::IOS)
     IPHONE_11_PRO ||= Frameit::Device.new("iphone-11-pro", "Apple iPhone 11 Pro", 9, [[1125, 2436], [2436, 1125]], 458, Color::SPACE_GRAY, Platform::IOS)

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

@@ -80,7 +80,7 @@ module Gym
         if Gym.config[:disable_xcpretty] || formatter == ''
           UI.verbose("Not using an xcodebuild formatter")
         elsif !options.empty?
-          UI.important("Detected legacy xcpretty being used so formatting wth xcpretty")
+          UI.important("Detected legacy xcpretty being used, so formatting with xcpretty")
           UI.important("Option(s) used: #{options.join(', ')}")
           pipe += pipe_xcpretty
         elsif formatter == 'xcpretty'

data/match/lib/match/change_password.rb

@@ -19,19 +19,13 @@ module Match
       new_password = FastlaneCore::Helper.ask_password(message: "New passphrase for Git Repo: ", confirm: true)
 
       # Choose the right storage and encryption implementations
-      storage = Storage.for_mode(params[:storage_mode], {
-        git_url: params[:git_url],
-        shallow_clone: params[:shallow_clone],
-        skip_docs: params[:skip_docs],
-        git_branch: params[:git_branch],
-        git_full_name: params[:git_full_name],
-        git_user_email: params[:git_user_email],
-        clone_branch_directly: params[:clone_branch_directly]
-      })
+      storage = Storage.from_params(params)
       storage.download
 
       encryption = Encryption.for_storage_mode(params[:storage_mode], {
         git_url: params[:git_url],
+        s3_bucket: params[:s3_bucket],
+        s3_skip_encryption: params[:s3_skip_encryption],
         working_directory: storage.working_directory
       })
       encryption.decrypt_files

data/match/lib/match/commands_generator.rb

@@ -118,16 +118,13 @@ module Match
           params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
           params.load_configuration_file("Matchfile")
 
-          storage = Storage.for_mode(params[:storage_mode], {
-            git_url: params[:git_url],
-            shallow_clone: params[:shallow_clone],
-            git_branch: params[:git_branch],
-            clone_branch_directly: params[:clone_branch_directly]
-          })
+          storage = Storage.from_params(params)
           storage.download
 
           encryption = Encryption.for_storage_mode(params[:storage_mode], {
             git_url: params[:git_url],
+            s3_bucket: params[:s3_bucket],
+            s3_skip_encryption: params[:s3_skip_encryption],
             working_directory: storage.working_directory
           })
           encryption.decrypt_files if encryption

data/match/lib/match/encryption.rb

@@ -17,7 +17,7 @@ module Match
           },
           "s3" => lambda { |params|
             params[:keychain_name] = params[:s3_bucket]
-            return Encryption::OpenSSL.configure(params)
+            return params[:s3_skip_encryption] ? nil : Encryption::OpenSSL.configure(params)
           },
           "gitlab_secure_files" => lambda { |params|
             return nil

data/match/lib/match/importer.rb

@@ -15,42 +15,14 @@ module Match
       profile_path = ensure_valid_file_path(profile_path, "Provisioning profile", ".mobileprovision or .provisionprofile", optional: true)
 
       # Storage
-      storage = Storage.for_mode(params[:storage_mode], {
-        git_url: params[:git_url],
-        shallow_clone: params[:shallow_clone],
-        skip_docs: params[:skip_docs],
-        git_branch: params[:git_branch],
-        git_full_name: params[:git_full_name],
-        git_user_email: params[:git_user_email],
-        git_private_key: params[:git_private_key],
-        git_basic_authorization: params[:git_basic_authorization],
-        git_bearer_authorization: params[:git_bearer_authorization],
-        clone_branch_directly: params[:clone_branch_directly],
-        type: params[:type].to_s,
-        platform: params[:platform].to_s,
-        google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
-        google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
-        google_cloud_project_id: params[:google_cloud_project_id].to_s,
-        skip_google_cloud_account_confirmation: params[:skip_google_cloud_account_confirmation],
-        s3_bucket: params[:s3_bucket],
-        s3_region: params[:s3_region],
-        s3_access_key: params[:s3_access_key],
-        s3_secret_access_key: params[:s3_secret_access_key],
-        s3_object_prefix: params[:s3_object_prefix],
-        gitlab_project: params[:gitlab_project],
-        gitlab_host: params[:gitlab_host],
-        readonly: params[:readonly],
-        username: params[:username],
-        team_id: params[:team_id],
-        team_name: params[:team_name],
-        api_key_path: params[:api_key_path],
-        api_key: params[:api_key]
-      })
+      storage = Storage.from_params(params)
       storage.download
 
       # Encryption
       encryption = Encryption.for_storage_mode(params[:storage_mode], {
         git_url: params[:git_url],
+        s3_bucket: params[:s3_bucket],
+        s3_skip_encryption: params[:s3_skip_encryption],
         working_directory: storage.working_directory
       })
       encryption.decrypt_files if encryption

data/match/lib/match/migrate.rb

@@ -13,13 +13,15 @@ module Match
 
       # We init the Google storage client before the git client
       # to ask for all the missing inputs *before* cloning the git repo
-      google_cloud_storage = Storage.for_mode("google_cloud", {
+      google_cloud_storage = Storage.from_params({
+        storage_mode: "google_cloud",
         google_cloud_bucket_name: params[:google_cloud_bucket_name],
         google_cloud_keys_file: params[:google_cloud_keys_file],
         google_cloud_project_id: params[:google_cloud_project_id]
       })
 
-      git_storage = Storage.for_mode("git", {
+      git_storage = Storage.from_params({
+        storage_mode: "git",
         git_url: params[:git_url],
         shallow_clone: params[:shallow_clone],
         git_branch: params[:git_branch],
@@ -29,6 +31,8 @@ module Match
 
       encryption = Encryption.for_storage_mode(params[:storage_mode], {
         git_url: params[:git_url],
+        s3_bucket: params[:s3_bucket],
+        s3_skip_encryption: params[:s3_skip_encryption],
         working_directory: git_storage.working_directory
       })
       encryption.decrypt_files if encryption

data/match/lib/match/nuke.rb

@@ -34,36 +34,14 @@ module Match
 
       spaceship_login
 
-      self.storage = Storage.for_mode(params[:storage_mode], {
-        git_url: params[:git_url],
-        shallow_clone: params[:shallow_clone],
-        skip_docs: params[:skip_docs],
-        git_branch: params[:git_branch],
-        git_full_name: params[:git_full_name],
-        git_user_email: params[:git_user_email],
-
-        git_private_key: params[:git_private_key],
-        git_basic_authorization: params[:git_basic_authorization],
-        git_bearer_authorization: params[:git_bearer_authorization],
-
-        clone_branch_directly: params[:clone_branch_directly],
-        google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
-        google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
-        google_cloud_project_id: params[:google_cloud_project_id].to_s,
-        s3_region: params[:s3_region].to_s,
-        s3_access_key: params[:s3_access_key].to_s,
-        s3_secret_access_key: params[:s3_secret_access_key].to_s,
-        s3_bucket: params[:s3_bucket].to_s,
-        s3_object_prefix: params[:s3_object_prefix].to_s,
-        gitlab_project: params[:gitlab_project],
-        gitlab_host: params[:gitlab_host],
-        team_id: params[:team_id] || Spaceship::ConnectAPI.client.portal_team_id
-      })
+      self.storage = Storage.from_params(params)
       self.storage.download
 
       # After the download was complete
       self.encryption = Encryption.for_storage_mode(params[:storage_mode], {
         git_url: params[:git_url],
+        s3_bucket: params[:s3_bucket],
+        s3_skip_encryption: params[:s3_skip_encryption],
         working_directory: storage.working_directory
       })
       self.encryption.decrypt_files if self.encryption

data/match/lib/match/options.rb

@@ -4,6 +4,7 @@ require 'credentials_manager/appfile_config'
 require_relative 'module'
 
 module Match
+  # rubocop:disable Metrics/ClassLength
   class Options
     # This is match specific, as users can append storage specific options
     def self.append_option(option)
@@ -222,6 +223,11 @@ module Match
                                      env_name: "MATCH_S3_OBJECT_PREFIX",
                                      description: "Prefix to be used on all objects uploaded to S3",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :s3_skip_encryption,
+                                     env_name: "MATCH_S3_SKIP_ENCRYPTION",
+                                     description: "Skip encryption of all objects uploaded to S3. WARNING: only enable this on S3 buckets with sufficiently restricted permissions and server-side encryption enabled. See https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingEncryption.html",
+                                     type: Boolean,
+                                     default_value: false),
 
         # Storage: GitLab Secure Files
         FastlaneCore::ConfigItem.new(key: :gitlab_project,
@@ -349,4 +355,5 @@ module Match
       ]
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/match/lib/match/runner.rb

@@ -31,43 +31,16 @@ module Match
       update_optional_values_depending_on_storage_type(params)
 
       # Choose the right storage and encryption implementations
-      self.storage = Storage.for_mode(params[:storage_mode], {
-        git_url: params[:git_url],
-        shallow_clone: params[:shallow_clone],
-        skip_docs: params[:skip_docs],
-        git_branch: params[:git_branch],
-        git_full_name: params[:git_full_name],
-        git_user_email: params[:git_user_email],
-        clone_branch_directly: params[:clone_branch_directly],
-        git_basic_authorization: params[:git_basic_authorization],
-        git_bearer_authorization: params[:git_bearer_authorization],
-        git_private_key: params[:git_private_key],
-        type: params[:type].to_s,
-        generate_apple_certs: params[:generate_apple_certs],
-        platform: params[:platform].to_s,
-        google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
-        google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
-        google_cloud_project_id: params[:google_cloud_project_id].to_s,
-        skip_google_cloud_account_confirmation: params[:skip_google_cloud_account_confirmation],
-        s3_region: params[:s3_region],
-        s3_access_key: params[:s3_access_key],
-        s3_secret_access_key: params[:s3_secret_access_key],
-        s3_bucket: params[:s3_bucket],
-        s3_object_prefix: params[:s3_object_prefix],
-        gitlab_project: params[:gitlab_project],
-        gitlab_host: params[:gitlab_host],
-        readonly: params[:readonly],
-        username: params[:readonly] ? nil : params[:username], # only pass username if not readonly
-        team_id: params[:team_id],
-        team_name: params[:team_name],
-        api_key_path: params[:api_key_path],
-        api_key: params[:api_key]
-      })
+      storage_params = params
+      storage_params[:username] = params[:readonly] ? nil : params[:username] # only pass username if not readonly
+      self.storage = Storage.from_params(storage_params)
       storage.download
 
       # Init the encryption only after the `storage.download` was called to have the right working directory
       encryption = Encryption.for_storage_mode(params[:storage_mode], {
         git_url: params[:git_url],
+        s3_bucket: params[:s3_bucket],
+        s3_skip_encryption: params[:s3_skip_encryption],
         working_directory: storage.working_directory
       })
       encryption.decrypt_files if encryption

data/match/lib/match/setup.rb

@@ -15,7 +15,7 @@ module Match
         self.storage_options
       )
 
-      storage = Storage.for_mode(storage_mode, {})
+      storage = Storage.from_params({ storage_mode: storage_mode })
 
       specific_content = storage.generate_matchfile_content
       UI.crash!("Looks like `generate_matchfile_content` was `nil` for `#{storage_mode}`") if specific_content.nil?

data/match/lib/match/storage/gitlab/client.rb

@@ -40,6 +40,8 @@ module Match
         def files
           @files ||= begin
             url = URI.parse(base_url)
+            # 100 is maximum number of Secure files available on Gitlab https://docs.gitlab.com/ee/api/secure_files.html
+            url.query = [url.query, "per_page=100"].compact.join('&')
 
             request = Net::HTTP::Get.new(url.request_uri)
 
@@ -69,32 +71,56 @@ module Match
               "name" => target_file
             )
 
-            response = execute_request(url, request)
+            execute_request(url, request, target_file)
+          end
+        end
+
+        def execute_request(url, request, target_file = nil)
+          request[authentication_key] = authentication_value
+
+          http = Net::HTTP.new(url.host, url.port)
+          http.use_ssl = url.instance_of?(URI::HTTPS)
+
+          begin
+            response = http.request(request)
+          rescue Errno::ECONNREFUSED, SocketError => message
+            UI.user_error!("GitLab connection error: #{message}")
+          end
 
-            log_upload_error(response, target_file) if response.code != "201"
+          unless response.kind_of?(Net::HTTPSuccess)
+            handle_response_error(response, target_file)
           end
+
+          response
         end
 
-        def log_upload_error(response, target_file)
+        def handle_response_error(response, target_file = nil)
+          error_prefix      = "GitLab storage error:"
+          file_debug_string = "File: #{target_file}" unless target_file.nil?
+          api_debug_string  = "API: #{@api_v4_url}"
+          debug_info        = "(#{[file_debug_string, api_debug_string].compact.join(', ')})"
+
           begin
-            response_body = JSON.parse(response.body)
+            parsed = JSON.parse(response.body)
           rescue JSON::ParserError
-            response_body = response.body
           end
 
-          if response_body["message"] && (response_body["message"]["name"] == ["has already been taken"])
-            UI.error("#{target_file} already exists in GitLab project #{@project_id}, file not uploaded")
+          if parsed && parsed["message"] && (parsed["message"]["name"] == ["has already been taken"])
+            error_handler = :error
+            error = "#{target_file} already exists in GitLab project #{@project_id}, file not uploaded"
           else
-            UI.error("Upload error for #{target_file}: #{response_body}")
+            error_handler = :user_error!
+            error = "#{response.code}: #{response.body}"
           end
-        end
+          error_message = [error_prefix, error, debug_info].join(' ')
 
-        def execute_request(url, request)
-          request[authentication_key] = authentication_value
+          UI.send(error_handler, error_message)
+        end
 
-          http = Net::HTTP.new(url.host, url.port)
-          http.use_ssl = url.instance_of?(URI::HTTPS)
-          http.request(request)
+        def prompt_for_access_token
+          unless authentication_key
+            @private_token = UI.input("Please supply a GitLab personal or project access token: ")
+          end
         end
       end
     end

data/match/lib/match/storage/gitlab_secure_files.rb

@@ -47,7 +47,8 @@ module Match
           team_id: params[:team_id],
           team_name: params[:team_name],
           api_key_path: params[:api_key_path],
-          api_key: params[:api_key]
+          api_key: params[:api_key],
+          gitlab_host: params[:gitlab_host]
         )
       end
 
@@ -60,7 +61,8 @@ module Match
                      team_id: nil,
                      team_name: nil,
                      api_key_path: nil,
-                     api_key: nil)
+                     api_key: nil,
+                     gitlab_host: nil)
 
         @readonly = readonly
         @username = username
@@ -68,6 +70,7 @@ module Match
         @team_name = team_name
         @api_key_path = api_key_path
         @api_key = api_key
+        @gitlab_host = gitlab_host
 
         @job_token = job_token
         @private_token = private_token
@@ -95,6 +98,8 @@ module Match
       end
 
       def download
+        gitlab_client.prompt_for_access_token
+
         # Check if we already have a functional working_directory
         return if @working_directory
 

data/match/lib/match/storage/s3_storage.rb

@@ -102,6 +102,12 @@ module Match
         self.working_directory = Dir.mktmpdir
 
         s3_client.find_bucket!(s3_bucket).objects(prefix: s3_object_prefix).each do |object|
+
+          # Prevent download if the file path is a directory.
+          # We need to check if string ends with "/" instead of using `File.directory?` because
+          # the string represent a remote location, not a local file in disk.
+          next if object.key.end_with?("/")
+
           file_path = strip_s3_object_prefix(object.key) # :s3_object_prefix:team_id/path/to/file
 
           # strip s3_prefix from file_path

data/match/lib/match/storage.rb

@@ -10,16 +10,66 @@ module Match
       def backends
         @backends ||= {
           "git" => lambda { |params|
-            return Storage::GitStorage.configure(params)
+            return Storage::GitStorage.configure({
+              type: params[:type],
+              platform: params[:platform],
+              git_url: params[:git_url],
+              shallow_clone: params[:shallow_clone],
+              skip_docs: params[:skip_docs],
+              git_branch: params[:git_branch],
+              git_full_name: params[:git_full_name],
+              git_user_email: params[:git_user_email],
+              clone_branch_directly: params[:clone_branch_directly],
+              git_basic_authorization: params[:git_basic_authorization],
+              git_bearer_authorization: params[:git_bearer_authorization],
+              git_private_key: params[:git_private_key]
+            })
           },
           "google_cloud" => lambda { |params|
-            return Storage::GoogleCloudStorage.configure(params)
+            return Storage::GoogleCloudStorage.configure({
+              type: params[:type],
+              platform: params[:platform],
+              google_cloud_bucket_name: params[:google_cloud_bucket_name],
+              google_cloud_keys_file: params[:google_cloud_keys_file],
+              google_cloud_project_id: params[:google_cloud_project_id],
+              readonly: params[:readonly],
+              username: params[:username],
+              team_id: params[:team_id],
+              team_name: params[:team_name],
+              api_key_path: params[:api_key_path],
+              api_key: params[:api_key],
+              skip_google_cloud_account_confirmation: params[:skip_google_cloud_account_confirmation]
+            })
           },
           "s3" => lambda { |params|
-            return Storage::S3Storage.configure(params)
+            return Storage::S3Storage.configure({
+              s3_region: params[:s3_region],
+              s3_access_key: params[:s3_access_key],
+              s3_secret_access_key: params[:s3_secret_access_key],
+              s3_bucket: params[:s3_bucket],
+              s3_object_prefix: params[:s3_object_prefix],
+              readonly: params[:readonly],
+              username: params[:username],
+              team_id: params[:team_id],
+              team_name: params[:team_name],
+              api_key_path: params[:api_key_path],
+              api_key: params[:api_key]
+            })
           },
           "gitlab_secure_files" => lambda { |params|
-            return Storage::GitLabSecureFiles.configure(params)
+            return Storage::GitLabSecureFiles.configure({
+              gitlab_host: params[:gitlab_host],
+              gitlab_project: params[:gitlab_project],
+              git_url: params[:git_url], # enables warning about unnecessary git_url
+              job_token: params[:job_token],
+              private_token: params[:private_token],
+              readonly: params[:readonly],
+              username: params[:username],
+              team_id: params[:team_id],
+              team_name: params[:team_name],
+              api_key_path: params[:api_key_path],
+              api_key: params[:api_key]
+            })
           }
         }
       end
@@ -39,7 +89,8 @@ module Match
         end
       end
 
-      def for_mode(storage_mode, params)
+      def from_params(params)
+        storage_mode = params[:storage_mode]
         configurator = backends[storage_mode.to_s]
         return configurator.call(params) if configurator
 

data/scan/lib/scan/test_command_generator.rb

@@ -132,7 +132,7 @@ module Scan
       if formatter == ''
         UI.verbose("Not using an xcodebuild formatter")
       elsif !options.empty?
-        UI.important("Detected legacy xcpretty being used so formatting wth xcpretty")
+        UI.important("Detected legacy xcpretty being used, so formatting with xcpretty")
         UI.important("Option(s) used: #{options.join(', ')}")
         pipe << pipe_xcpretty
       elsif formatter == 'xcpretty'

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -34,7 +34,7 @@ module Snapshot
         if Snapshot.config[:disable_xcpretty] || formatter == ''
           UI.verbose("Not using an xcodebuild formatter")
         elsif !options.empty?
-          UI.important("Detected legacy xcpretty being used so formatting wth xcpretty")
+          UI.important("Detected legacy xcpretty being used, so formatting with xcpretty")
           UI.important("Option(s) used: #{options.join(', ')}")
           pipe += pipe_xcpretty
         elsif formatter == 'xcpretty'

data/spaceship/lib/spaceship/client.rb

@@ -533,7 +533,6 @@ module Spaceship
 
           if try_upgrade_2fa_later(response)
             store_cookie
-            fetch_olympus_session
             return true
           end