fastlane 2.216.0 → 2.218.0

data/sigh/lib/sigh/runner.rb

@@ -14,7 +14,7 @@ module Sigh
     # returns the path the newly created provisioning profile (in /tmp usually)
     def run
       FastlaneCore::PrintTable.print_values(config: Sigh.config,
-                                         hide_keys: [:output_path],
+                                         hide_keys: [:output_path, :cached_certificates, :cached_devices, :cached_bundle_ids, :cached_profiles],
                                              title: "Summary for sigh #{Fastlane::VERSION}")
 
       if (api_token = Spaceship::ConnectAPI::Token.from(hash: Sigh.config[:api_key], filepath: Sigh.config[:api_key_path]))
@@ -48,7 +48,7 @@ module Sigh
           profile = create_profile!
         end
       else
-        UI.user_error!("No matching provisioning profile found and can not create a new one because you enabled `readonly`") if Sigh.config[:readonly]
+        UI.user_error!("No matching provisioning profile found and cannot create a new one because you enabled `readonly`") if Sigh.config[:readonly]
         UI.important("No existing profiles found, that match the certificates you have installed locally! Creating a new provisioning profile for you")
         ensure_app_exists!
         profile = create_profile!
@@ -69,28 +69,7 @@ module Sigh
     def profile_type
       return @profile_type if @profile_type
 
-      case Sigh.config[:platform]
-      when "ios"
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_STORE
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE if Spaceship::ConnectAPI.client.in_house?
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC if Sigh.config[:adhoc]
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_DEVELOPMENT if Sigh.config[:development]
-      when "tvos"
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_STORE
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE if Spaceship::ConnectAPI.client.in_house?
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC if Sigh.config[:adhoc]
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_DEVELOPMENT if Sigh.config[:development]
-      when "macos"
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_STORE
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_INHOUSE if Spaceship::ConnectAPI.client.in_house?
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DEVELOPMENT if Sigh.config[:development]
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT if Sigh.config[:developer_id]
-      when "catalyst"
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_STORE
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_INHOUSE if Spaceship::ConnectAPI.client.in_house?
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DEVELOPMENT if Sigh.config[:development]
-        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT if Sigh.config[:developer_id]
-      end
+      @profile_type = Sigh.profile_type_for_config(platform: Sigh.config[:platform], in_house: Spaceship::ConnectAPI.client.in_house?, config: Sigh.config)
 
       @profile_type
     end
@@ -99,9 +78,19 @@ module Sigh
     def fetch_profiles
       UI.message("Fetching profiles...")
 
-      # Filtering on 'profileType' seems to be undocumented as of 2020-07-30
-      # but works on both web session and official API
-      results = Spaceship::ConnectAPI::Profile.all(filter: { profileType: profile_type }, includes: "bundleId,certificates").select do |profile|
+      filter = { profileType: profile_type }
+      # We can greatly speed up the search by filtering on the provisioning profile name
+      filter[:name] = Sigh.config[:provisioning_name] if Sigh.config[:provisioning_name].to_s.length > 0
+
+      includes = 'bundleId'
+
+      unless Sigh.config[:skip_certificate_verification] || Sigh.config[:include_all_certificates]
+        includes += ',certificates'
+      end
+
+      results = Sigh.config[:cached_profiles]
+      results ||= Spaceship::ConnectAPI::Profile.all(filter: filter, includes: includes)
+      results.select! do |profile|
         profile.bundle_id.identifier == Sigh.config[:app_identifier]
       end
 
@@ -166,7 +155,9 @@ module Sigh
       name = Sigh.config[:provisioning_name] || [app_identifier, profile_type_pretty_type].join(' ')
 
       unless Sigh.config[:skip_fetch_profiles]
-        profile = Spaceship::ConnectAPI::Profile.all.find { |p| p.name == name }
+        # We can greatly speed up the search by filtering on the provisioning profile name
+        # It seems that there's no way to search for exact match using the API, so we'll need to run additional checks afterwards
+        profile = Spaceship::ConnectAPI::Profile.all(filter: { name: name }).find { |p| p.name == name }
         if profile
           UI.user_error!("The name '#{name}' is already taken, and fail_on_name_taken is true") if Sigh.config[:fail_on_name_taken]
           UI.error("The name '#{name}' is already taken, using another one.")
@@ -174,7 +165,9 @@ module Sigh
         end
       end
 
-      bundle_id = Spaceship::ConnectAPI::BundleId.find(app_identifier)
+      bundle_ids = Sigh.config[:cached_bundle_ids]
+      bundle_id = bundle_ids.detect { |e| e.identifier == app_identifier } if bundle_ids
+      bundle_id ||= Spaceship::ConnectAPI::BundleId.find(app_identifier)
       unless bundle_id
         UI.user_error!("Could not find App with App Identifier '#{Sigh.config[:app_identifier]}'")
       end
@@ -207,67 +200,15 @@ module Sigh
       filter = {
         certificateType: certificate_types.join(',')
       }
-      return Spaceship::ConnectAPI::Certificate.all(filter: filter)
+
+      certificates = Sigh.config[:cached_certificates]
+      certificates ||= Spaceship::ConnectAPI::Certificate.all(filter: filter)
+
+      return certificates
     end
 
     def certificates_for_profile_and_platform
-      types = []
-
-      case Sigh.config[:platform].to_s
-      when 'ios', 'tvos'
-        if profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_DEVELOPMENT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_DEVELOPMENT
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT,
-            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT
-          ]
-        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE
-          # Enterprise accounts don't have access to Apple Distribution certificates
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
-          ]
-        # handles case where the desired certificate type is adhoc but the account is an enterprise account
-        # the apple dev portal api has a weird quirk in it where if you query for distribution certificates
-        # for enterprise accounts, you get nothing back even if they exist.
-        elsif (profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC) && Spaceship::ConnectAPI.client && Spaceship::ConnectAPI.client.in_house?
-          # Enterprise accounts don't have access to Apple Distribution certificates
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
-          ]
-        else
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION,
-            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
-          ]
-        end
-
-      when 'macos', 'catalyst'
-        if profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DEVELOPMENT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DEVELOPMENT
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT,
-            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DEVELOPMENT
-          ]
-        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_STORE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_STORE
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION,
-            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DISTRIBUTION
-          ]
-        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION,
-            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
-          ]
-        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_INHOUSE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_INHOUSE
-          # Enterprise accounts don't have access to Apple Distribution certificates
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DISTRIBUTION
-          ]
-        else
-          types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION,
-            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DISTRIBUTION
-          ]
-        end
-      end
+      types = Sigh.certificate_types_for_profile_and_platform(platform: Sigh.config[:platform], profile_type: profile_type)
 
       fetch_certificates(types)
     end
@@ -276,30 +217,13 @@ module Sigh
       # Only use devices if development or adhoc
       return [] if !Sigh.config[:development] && !Sigh.config[:adhoc]
 
-      device_classes = case Sigh.config[:platform].to_s
-                       when 'ios'
-                         [
-                           Spaceship::ConnectAPI::Device::DeviceClass::APPLE_WATCH,
-                           Spaceship::ConnectAPI::Device::DeviceClass::IPAD,
-                           Spaceship::ConnectAPI::Device::DeviceClass::IPHONE,
-                           Spaceship::ConnectAPI::Device::DeviceClass::IPOD
-                         ]
-                       when 'tvos'
-                         [Spaceship::ConnectAPI::Device::DeviceClass::APPLE_TV]
-                       when 'macos', 'catalyst'
-                         [Spaceship::ConnectAPI::Device::DeviceClass::MAC]
-                       end
-      if Sigh.config[:platform].to_s == 'ios' && Sigh.config[:include_mac_in_profiles]
-        device_classes += [Spaceship::ConnectAPI::Device::DeviceClass::APPLE_SILICON_MAC]
-      end
-      if Spaceship::ConnectAPI.token
-        return Spaceship::ConnectAPI::Device.all.select do |device|
-          device_classes.include?(device.device_class)
-        end
-      else
-        filter = { deviceClass: device_classes.join(",") }
-        return Spaceship::ConnectAPI::Device.all(filter: filter)
-      end
+      devices = Sigh.config[:cached_devices]
+      devices ||= Spaceship::ConnectAPI::Device.devices_for_platform(
+        platform: Sigh.config[:platform],
+        include_mac_in_profiles: Sigh.config[:include_mac_in_profiles]
+      )
+
+      return devices
     end
 
     # Certificate to use based on the current distribution mode

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -15,13 +15,12 @@
 import Foundation
 import XCTest
 
-var deviceLanguage = ""
-var locale = ""
-
+@MainActor
 func setupSnapshot(_ app: XCUIApplication, waitForAnimations: Bool = true) {
     Snapshot.setupSnapshot(app, waitForAnimations: waitForAnimations)
 }
 
+@MainActor
 func snapshot(_ name: String, waitForLoadingIndicator: Bool) {
     if waitForLoadingIndicator {
         Snapshot.snapshot(name)
@@ -33,6 +32,7 @@ func snapshot(_ name: String, waitForLoadingIndicator: Bool) {
 /// - Parameters:
 ///   - name: The name of the snapshot
 ///   - timeout: Amount of seconds to wait until the network loading indicator disappears. Pass `0` if you don't want to wait.
+@MainActor
 func snapshot(_ name: String, timeWaitingForIdle timeout: TimeInterval = 20) {
     Snapshot.snapshot(name, timeWaitingForIdle: timeout)
 }
@@ -52,6 +52,7 @@ enum SnapshotError: Error, CustomDebugStringConvertible {
 }
 
 @objcMembers
+@MainActor
 open class Snapshot: NSObject {
     static var app: XCUIApplication?
     static var waitForAnimations = true
@@ -59,6 +60,8 @@ open class Snapshot: NSObject {
     static var screenshotsDirectory: URL? {
         return cacheDirectory?.appendingPathComponent("screenshots", isDirectory: true)
     }
+    static var deviceLanguage = ""
+    static var currentLocale = ""
 
     open class func setupSnapshot(_ app: XCUIApplication, waitForAnimations: Bool = true) {
 
@@ -103,17 +106,17 @@ open class Snapshot: NSObject {
 
         do {
             let trimCharacterSet = CharacterSet.whitespacesAndNewlines
-            locale = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
+            currentLocale = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
         } catch {
             NSLog("Couldn't detect/set locale...")
         }
 
-        if locale.isEmpty && !deviceLanguage.isEmpty {
-            locale = Locale(identifier: deviceLanguage).identifier
+        if currentLocale.isEmpty && !deviceLanguage.isEmpty {
+            currentLocale = Locale(identifier: deviceLanguage).identifier
         }
 
-        if !locale.isEmpty {
-            app.launchArguments += ["-AppleLocale", "\"\(locale)\""]
+        if !currentLocale.isEmpty {
+            app.launchArguments += ["-AppleLocale", "\"\(currentLocale)\""]
         }
     }
 
@@ -281,6 +284,7 @@ private extension XCUIElementQuery {
         return self.containing(isNetworkLoadingIndicator)
     }
 
+    @MainActor
     var deviceStatusBars: XCUIElementQuery {
         guard let app = Snapshot.app else {
             fatalError("XCUIApplication is not set. Please call setupSnapshot(app) before snapshot().")
@@ -306,4 +310,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.29]
+// SnapshotHelperVersion [1.30]

data/snapshot/lib/snapshot/reports_generator.rb

@@ -84,6 +84,15 @@ module Snapshot
       {
         # snapshot in Xcode 9 saves screenshots with the SIMULATOR_DEVICE_NAME
         # which includes spaces
+        'iPhone 15 Pro Max' => "iPhone 15 Pro Max",
+        'iPhone 15 Pro' => "iPhone 15 Pro",
+        'iPhone 15 Plus' => "iPhone 15 Plus",
+        'iPhone 15' => "iPhone 15",
+        'iPhone 14 Pro Max' => "iPhone 14 Pro Max",
+        'iPhone 14 Pro' => "iPhone 14 Pro",
+        'iPhone 14 Plus' => "iPhone 14 Plus",
+        'iPhone 14' => "iPhone 14",
+        'iPhone SE (3rd generation)' => "iPhone SE (3rd generation)",
         'iPhone 13 Pro Max' => "iPhone 13 Pro Max",
         'iPhone 13 Pro' => "iPhone 13 Pro",
         'iPhone 13 mini' => "iPhone 13 mini",
@@ -92,6 +101,7 @@ module Snapshot
         'iPhone 12 Pro' => "iPhone 12 Pro",
         'iPhone 12 mini' => "iPhone 12 mini",
         'iPhone 12' => "iPhone 12",
+        'iPhone SE (2nd generation)' => "iPhone SE (2nd generation)",
         'iPhone 11 Pro Max' => "iPhone 11 Pro Max",
         'iPhone 11 Pro' => "iPhone 11 Pro",
         'iPhone 11' => "iPhone 11",
@@ -112,20 +122,34 @@ module Snapshot
         'iPhone SE' => "iPhone SE",
         'iPhone 4s' => "iPhone 4s (3.5-Inch)",
         'iPad 2' => 'iPad 2',
+        'iPad Air (5th generation)' => 'iPad Air (5th generation)',
+        'iPad Air (4th generation)' => 'iPad Air (4th generation)',
         'iPad Air (3rd generation)' => 'iPad Air (3rd generation)',
         'iPad Air 2' => 'iPad Air 2',
         'iPad Air' => 'iPad Air',
-        'iPad (5th generation)' => 'iPad (5th generation)',
+        'iPad (10th generation)' => 'iPad (10th generation)',
+        'iPad (9th generation)' => 'iPad (9th generation)',
+        'iPad (8th generation)' => 'iPad (8th generation)',
         'iPad (7th generation)' => 'iPad (7th generation)',
-        'iPad mini 2' => 'iPad mini 2',
-        'iPad mini 3' => 'iPad mini 3',
-        'iPad mini 4' => 'iPad mini 4',
+        'iPad (6th generation)' => 'iPad (6th generation)',
+        'iPad (5th generation)' => 'iPad (5th generation)',
         'iPad mini (6th generation)' => 'iPad mini (6th generation)',
+        'iPad mini (5th generation)' => 'iPad mini (5th generation)',
+        'iPad mini 4' => 'iPad mini 4',
+        'iPad mini 3' => 'iPad mini 3',
+        'iPad mini 2' => 'iPad mini 2',
         'iPad Pro (9.7-inch)' => 'iPad Pro (9.7-inch)',
         'iPad Pro (9.7 inch)' => 'iPad Pro (9.7-inch)', # iOS 10.3.1 simulator
         'iPad Pro (10.5-inch)' => 'iPad Pro (10.5-inch)',
+        'iPad Pro (11-inch) (4th generation) (16GB)' => 'iPad Pro (11-inch) (4th generation) (16GB)',
+        'iPad Pro (11-inch) (4th generation)' => 'iPad Pro (11-inch) (4th generation)',
+        'iPad Pro (11-inch) (3rd generation)' => 'iPad Pro (11-inch) (3rd generation)',
         'iPad Pro (11-inch) (2nd generation)' => 'iPad Pro (11-inch) (2nd generation)',
+        'iPad Pro (11-inch) (1st generation)' => 'iPad Pro (11-inch) (1st generation)',
         'iPad Pro (11-inch)' => 'iPad Pro (11-inch)',
+        'iPad Pro (12.9-inch) (6th generation) (16GB)' => 'iPad Pro (12.9-inch) (6th generation) (16GB)',
+        'iPad Pro (12.9-inch) (6th generation)' => 'iPad Pro (12.9-inch) (6th generation)',
+        'iPad Pro (12.9-inch) (5th generation)' => 'iPad Pro (12.9-inch) (5th generation)',
         'iPad Pro (12.9-inch) (4th generation)' => 'iPad Pro (12.9-inch) (4th generation)',
         'iPad Pro (12.9-inch) (3rd generation)' => 'iPad Pro (12.9-inch) (3rd generation)',
         'iPad Pro (12.9-inch) (2nd generation)' => 'iPad Pro (12.9-inch) (2nd generation)',
@@ -133,13 +157,30 @@ module Snapshot
         'iPad Pro (12.9 inch)' => 'iPad Pro (12.9-inch)', # iOS 10.3.1 simulator
         'iPad Pro' => 'iPad Pro (12.9-inch)', # iOS 9.3 simulator
         'iPod touch (7th generation)' => 'iPod touch (7th generation)',
-        'Apple TV 1080p' => 'Apple TV',
+        'Apple TV 4K (3rd generation)' => 'Apple TV 4K (3rd generation)',
+        'Apple TV 4K (3rd generation) (at 1080p)' => 'Apple TV 4K (3rd generation) (at 1080p)',
+        'Apple TV 4K (2nd generation)' => 'Apple TV 4K (2nd generation)',
+        'Apple TV 4K (2nd generation) (at 1080p)' => 'Apple TV 4K (2nd generation) (at 1080p)',
         'Apple TV 4K (at 1080p)' => 'Apple TV 4K (at 1080p)',
         'Apple TV 4K' => 'Apple TV 4K',
+        'Apple TV 1080p' => 'Apple TV',
         'Apple TV' => 'Apple TV',
         'Mac' => 'Mac',
-        'Apple Watch Series 5 - 44mm' => 'Apple Watch Series 5 - 44mm',
-        'Apple Watch Series 6 - 44mm' => 'Apple Watch Series 6 - 44mm'
+        'Apple Watch Ultra 2 (49mm)' => 'Apple Watch Ultra 2 (49mm)',
+        'Apple Watch SE (44mm)' => 'Apple Watch SE (44mm)',
+        'Apple Watch SE (40mm)' => 'Apple Watch SE (40mm)',
+        'Apple Watch Series 9 (45mm)' => 'Apple Watch Series 9 (45mm)',
+        'Apple Watch Series 9 (41mm)' => 'Apple Watch Series 9 (41mm)',
+        'Apple Watch Series 8 (45mm)' => 'Apple Watch Series 8 (45mm)',
+        'Apple Watch Series 8 (41mm)' => 'Apple Watch Series 8 (41mm)',
+        'Apple Watch Series 7 (45mm)' => 'Apple Watch Series 7 (45mm)',
+        'Apple Watch Series 7 (41mm)' => 'Apple Watch Series 7 (41mm)',
+        'Apple Watch Series 6 (44mm)' => 'Apple Watch Series 6 (44mm)',
+        'Apple Watch Series 6 (40mm)' => 'Apple Watch Series 6 (40mm)',
+        'Apple Watch Series 5 (44mm)' => 'Apple Watch Series 5 (44mm)',
+        'Apple Watch Series 5 (40mm)' => 'Apple Watch Series 5 (40mm)',
+        'Apple Watch Series 6 - 44mm' => 'Apple Watch Series 6 - 44mm',
+        'Apple Watch Series 5 - 44mm' => 'Apple Watch Series 5 - 44mm'
       }
     end
 

data/snapshot/lib/snapshot/setup.rb

@@ -19,7 +19,7 @@ module Snapshot
 
       if File.exist?(snapfile_path)
         if print_instructions_on_failure
-          print_instructions(snapshot_helper_filename: snapshot_helper_filename, snapfile_path: snapfile_path)
+          print_instructions(snapshot_helper_filename: snapshot_helper_filename)
           return
         else
           UI.user_error!("Snapfile already exists at path '#{snapfile_path}'. Run 'fastlane snapshot' to generate screenshots.")
@@ -37,7 +37,7 @@ module Snapshot
       print_instructions(snapshot_helper_filename: snapshot_helper_filename, snapfile_path: snapfile_path)
     end
 
-    def self.print_instructions(snapshot_helper_filename: nil, snapfile_path: nil)
+    def self.print_instructions(snapshot_helper_filename: nil)
       puts("Open your Xcode project and make sure to do the following:".yellow)
       puts("1) Add a new UI Test target to your project".yellow)
       puts("2) Add the ./fastlane/#{snapshot_helper_filename} to your UI Test target".yellow)

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb

@@ -109,33 +109,34 @@ module Snapshot
           end
         }
       ]
+      error_proc = proc do |output, return_code|
+        self.collected_errors.concat(failed_devices.map do |device, messages|
+          "#{device}: #{messages.join(', ')}"
+        end)
+
+        cleanup_after_failure(devices, language, locale, launch_args, return_code)
+
+        # no exception raised... that means we need to retry
+        UI.error("Caught error... #{return_code}")
+
+        self.current_number_of_retries_due_to_failing_simulator += 1
+        if self.current_number_of_retries_due_to_failing_simulator < 20 && return_code != 65
+          # If the return code is not 65, we should assume its a simulator failure and retry
+          launch_simultaneously(devices, language, locale, launch_args)
+        elsif retries < launcher_config.number_of_retries
+          # If there are retries remaining, run the tests again
+          retry_tests(retries, command, language, locale, launch_args, devices)
+        else
+          # It's important to raise an error, as we don't want to collect the screenshots
+          UI.crash!("Too many errors... no more retries...") if launcher_config.stop_after_first_error
+        end
+      end
       FastlaneCore::CommandExecutor.execute(command: command,
                                           print_all: true,
                                       print_command: true,
                                              prefix: prefix_hash,
                                             loading: "Loading...",
-                                              error: proc do |output, return_code|
-                                                self.collected_errors.concat(failed_devices.map do |device, messages|
-                                                  "#{device}: #{messages.join(', ')}"
-                                                end)
-
-                                                cleanup_after_failure(devices, language, locale, launch_args, return_code)
-
-                                                # no exception raised... that means we need to retry
-                                                UI.error("Caught error... #{return_code}")
-
-                                                self.current_number_of_retries_due_to_failing_simulator += 1
-                                                if self.current_number_of_retries_due_to_failing_simulator < 20 && return_code != 65
-                                                  # If the return code is not 65, we should assume its a simulator failure and retry
-                                                  launch_simultaneously(devices, language, locale, launch_args)
-                                                elsif retries < launcher_config.number_of_retries
-                                                  # If there are retries remaining, run the tests again
-                                                  retry_tests(retries, command, language, locale, launch_args, devices)
-                                                else
-                                                  # It's important to raise an error, as we don't want to collect the screenshots
-                                                  UI.crash!("Too many errors... no more retries...") if launcher_config.stop_after_first_error
-                                                end
-                                              end)
+                                              error: error_proc)
     end
 
     def cleanup_after_failure(devices, language, locale, launch_args, return_code)

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -107,7 +107,7 @@ module Snapshot
           output = Helper.backticks("xcrun simctl addmedia #{device_udid} #{path.shellescape} &> /dev/null")
 
           # Run legacy addphoto and addvideo if addmedia isn't found
-          # Output will be empty strin gif it was a success
+          # Output will be empty string if it was a success
           # Output will contain "usage: simctl" if command not found
           if output.include?('usage: simctl')
             Helper.backticks("xcrun simctl add#{media_type} #{device_udid} #{path.shellescape} &> /dev/null")
@@ -124,7 +124,7 @@ module Snapshot
       Helper.backticks("xcrun simctl bootstatus #{device_udid} -b &> /dev/null")
 
       # "Booted" status is not enough for to adjust the status bar
-      # Simulator could stil be booting with Apple logo
+      # Simulator could still be booting with Apple logo
       # Need to wait "some amount of time" until home screen shows
       boot_sleep = ENV["SNAPSHOT_SIMULATOR_WAIT_FOR_BOOT_TIMEOUT"].to_i || 10
       UI.message("Waiting #{boot_sleep} seconds for device to fully boot before overriding status bar... Set 'SNAPSHOT_SIMULATOR_WAIT_FOR_BOOT_TIMEOUT' environment variable to adjust timeout")

data/spaceship/lib/spaceship/client.rb

@@ -429,7 +429,7 @@ module Spaceship
           # which is common, as the session automatically invalidates after x hours (we don't know x)
           # In this case we don't actually care about the exact exception, and why it was failing
           # because either way, we'll have to do a fresh login, where we do the actual error handling
-          puts("Available session is not valid any more. Continuing with normal login.")
+          puts("Available session is not valid anymore. Continuing with normal login.")
         end
       end
       #

data/spaceship/lib/spaceship/connect_api/api_client.rb

@@ -65,7 +65,7 @@ module Spaceship
       end
 
       # Instance level hostname only used when creating
-      # App Store Connect API Farady client.
+      # App Store Connect API Faraday client.
       # Forwarding to class level if using web session.
       def hostname
         if @token
@@ -87,13 +87,14 @@ module Spaceship
         return @token.nil?
       end
 
-      def build_params(filter: nil, includes: nil, limit: nil, sort: nil, cursor: nil)
+      def build_params(filter: nil, includes: nil, fields: nil, limit: nil, sort: nil, cursor: nil)
         params = {}
 
         filter = filter.delete_if { |k, v| v.nil? } if filter
 
         params[:filter] = filter if filter && !filter.empty?
         params[:include] = includes if includes
+        params[:fields] = fields if fields
         params[:limit] = limit if limit
         params[:sort] = sort if sort
         params[:cursor] = cursor if cursor

data/spaceship/lib/spaceship/connect_api/client.rb

@@ -84,13 +84,13 @@ module Spaceship
         # Extending this instance to add API endpoints from these modules
         # Each of these modules adds a new setter method for an instance
         # of an ConnectAPI::APIClient
-        # These get set in set_indvidual_clients
+        # These get set in set_individual_clients
         self.extend(Spaceship::ConnectAPI::TestFlight::API)
         self.extend(Spaceship::ConnectAPI::Tunes::API)
         self.extend(Spaceship::ConnectAPI::Provisioning::API)
         self.extend(Spaceship::ConnectAPI::Users::API)
 
-        set_indvidual_clients(
+        set_individual_clients(
           cookie: cookie,
           current_team_id: current_team_id,
           token: token,
@@ -155,7 +155,7 @@ module Spaceship
 
         # Updating the tunes and portal clients requires resetting
         # of the clients in the API modules
-        set_indvidual_clients(
+        set_individual_clients(
           cookie: nil,
           current_team_id: nil,
           token: nil,
@@ -166,7 +166,7 @@ module Spaceship
 
       private
 
-      def set_indvidual_clients(cookie: nil, current_team_id: nil, token: nil, tunes_client: nil, portal_client: nil)
+      def set_individual_clients(cookie: nil, current_team_id: nil, token: nil, tunes_client: nil, portal_client: nil)
         # This was added by Spaceship::ConnectAPI::TestFlight::API and is required
         # to be set for API methods to have a client to send request on
         if cookie || token || tunes_client

data/spaceship/lib/spaceship/connect_api/models/app_preview_set.rb

@@ -17,6 +17,7 @@ module Spaceship
         IPHONE_55 = "IPHONE_55"
         IPHONE_58 = "IPHONE_58"
         IPHONE_65 = "IPHONE_65"
+        IPHONE_67 = "IPHONE_67"
 
         IPAD_97 = "IPAD_97"
         IPAD_105 = "IPAD_105"
@@ -33,6 +34,7 @@ module Spaceship
           IPHONE_55,
           IPHONE_58,
           IPHONE_65,
+          IPHONE_67,
 
           IPAD_97,
           IPAD_105,

data/spaceship/lib/spaceship/connect_api/models/app_screenshot.rb

@@ -103,7 +103,7 @@ module Spaceship
           # will result in a false failure. The response will return a 503 but the database
           # insert will eventually go through.
           #
-          # When this is observed, we will poll until we find the matchin screenshot that
+          # When this is observed, we will poll until we find the matching screenshot that
           # is awaiting for upload and file size
           #
           # https://github.com/fastlane/fastlane/pull/16842
@@ -143,7 +143,7 @@ module Spaceship
         }
 
         # Patch screenshot that file upload is complete
-        # Catch error if patch retries due to 504. Origal patch
+        # Catch error if patch retries due to 504. Original patch
         # may go through by return response as 504.
         begin
           screenshot = Spaceship::ConnectAPI.patch_app_screenshot(

data/spaceship/lib/spaceship/connect_api/models/app_screenshot_set.rb

@@ -43,6 +43,7 @@ module Spaceship
         APP_WATCH_SERIES_3 = "APP_WATCH_SERIES_3"
         APP_WATCH_SERIES_4 = "APP_WATCH_SERIES_4"
         APP_WATCH_SERIES_7 = "APP_WATCH_SERIES_7"
+        APP_WATCH_ULTRA = "APP_WATCH_ULTRA"
 
         APP_APPLE_TV = "APP_APPLE_TV"
 
@@ -97,6 +98,7 @@ module Spaceship
           APP_WATCH_SERIES_3,
           APP_WATCH_SERIES_4,
           APP_WATCH_SERIES_7,
+          APP_WATCH_ULTRA,
 
           APP_DESKTOP
         ]

data/spaceship/lib/spaceship/connect_api/models/bundle_id.rb

@@ -1,4 +1,4 @@
-require_relative '../model'
+require_relative '../../connect_api'
 require_relative './bundle_id_capability'
 module Spaceship
   class ConnectAPI
@@ -39,15 +39,15 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def self.all(client: nil, filter: {}, includes: nil, fields: nil, limit: Spaceship::ConnectAPI::MAX_OBJECTS_PER_PAGE_LIMIT, sort: nil)
         client ||= Spaceship::ConnectAPI
-        resps = client.get_bundle_ids(filter: filter, includes: includes).all_pages
+        resps = client.get_bundle_ids(filter: filter, includes: includes, fields: fields, limit: nil, sort: nil).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def self.find(identifier, includes: nil, client: nil)
+      def self.find(identifier, includes: nil, fields: nil, client: nil)
         client ||= Spaceship::ConnectAPI
-        return all(client: client, filter: { identifier: identifier }, includes: includes).find do |app|
+        return all(client: client, filter: { identifier: identifier }, includes: includes, fields: fields).find do |app|
           app.identifier == identifier
         end
       end

data/spaceship/lib/spaceship/connect_api/models/certificate.rb

@@ -1,4 +1,4 @@
-require_relative '../model'
+require_relative '../../connect_api'
 
 require 'openssl'
 
@@ -79,9 +79,9 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def self.all(client: nil, filter: {}, includes: nil, fields: nil, limit: Spaceship::ConnectAPI::MAX_OBJECTS_PER_PAGE_LIMIT, sort: nil)
         client ||= Spaceship::ConnectAPI
-        resps = client.get_certificates(filter: filter, includes: includes).all_pages
+        resps = client.get_certificates(filter: filter, includes: includes, fields: fields, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end