fastlane 2.217.0 → 2.219.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,10 +78,20 @@ 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|
-        profile.bundle_id.identifier == Sigh.config[:app_identifier]
+      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
 
       results = results.find_all do |current_profile|
@@ -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/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

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

@@ -1,4 +1,4 @@
-require_relative '../model'
+require_relative '../../connect_api'
 require_relative './bundle_id_capability'
 module Spaceship
   class ConnectAPI
@@ -39,7 +39,7 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, fields: 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, fields: fields, limit: nil, sort: nil).all_pages
         return resps.flat_map(&:to_models)

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

@@ -1,4 +1,4 @@
-require_relative '../model'
+require_relative '../../connect_api'
 
 require 'openssl'
 
@@ -79,7 +79,7 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, fields: 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, fields: fields, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)

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

@@ -1,4 +1,5 @@
-require_relative '../model'
+require_relative '../../connect_api'
+
 module Spaceship
   class ConnectAPI
     class Device
@@ -50,13 +51,91 @@ module Spaceship
       #
       # API
       #
-
-      def self.all(client: nil, filter: {}, includes: nil, fields: 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_devices(filter: filter, includes: includes, fields: fields, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
 
+      # @param platform [String] The provisioning profile's platform (i.e. ios, tvos, macos, catalyst).
+      # @param include_mac_in_profiles [Bool] Whether to include macs in iOS provisioning profiles. false by default.
+      # @param client [ConnectAPI] ConnectAPI client.
+      # @return (Device) List of enabled devices.
+      def self.devices_for_platform(platform: nil, include_mac_in_profiles: false, client: nil)
+        platform = platform.to_sym
+        include_mac_in_profiles &&= platform == :ios
+
+        device_platform = case platform
+                          when :osx, :macos, :mac
+                            Spaceship::ConnectAPI::Platform::MAC_OS
+                          when :ios
+                            Spaceship::ConnectAPI::Platform::IOS
+                          when :catalyst
+                            Spaceship::ConnectAPI::Platform::MAC_OS
+                          end
+
+        device_platforms = [
+          device_platform,
+          'UNIVERSAL' # Universal Bundle ID platform is undocumented as of Oct 4, 2023.
+        ]
+
+        device_classes =
+          case platform
+          when :ios
+            [
+              Spaceship::ConnectAPI::Device::DeviceClass::IPAD,
+              Spaceship::ConnectAPI::Device::DeviceClass::IPHONE,
+              Spaceship::ConnectAPI::Device::DeviceClass::IPOD,
+              Spaceship::ConnectAPI::Device::DeviceClass::APPLE_WATCH
+            ]
+          when :tvos
+            [
+              Spaceship::ConnectAPI::Device::DeviceClass::APPLE_TV
+            ]
+          when :macos, :catalyst
+            [
+              Spaceship::ConnectAPI::Device::DeviceClass::MAC
+            ]
+          else
+            []
+          end
+
+        if include_mac_in_profiles
+          device_classes << Spaceship::ConnectAPI::Device::DeviceClass::APPLE_SILICON_MAC
+          device_platforms << Spaceship::ConnectAPI::Platform::MAC_OS
+        end
+
+        filter = {
+          status: Spaceship::ConnectAPI::Device::Status::ENABLED,
+          platform: device_platforms.uniq.join(',')
+        }
+
+        devices = Spaceship::ConnectAPI::Device.all(
+          client: client,
+          filter: filter
+        )
+
+        unless device_classes.empty?
+          devices.select! do |device|
+            # App Store Connect API return MAC in device_class instead of APPLE_SILICON_MAC for Silicon Macs.
+            # The difference between old MAC and APPLE_SILICON_MAC is provisioning uuid.
+            # Intel-based provisioning UUID: 01234567-89AB-CDEF-0123-456789ABCDEF.
+            # arm64-based provisioning UUID: 01234567-89ABCDEF12345678.
+            # Workaround is to include macs having:
+            #   * 25 chars length and only one hyphen in provisioning UUID.
+            if include_mac_in_profiles &&
+               device.device_class == Spaceship::ConnectAPI::Device::DeviceClass::MAC
+
+              next device.udid.length == 25 && device.udid.count('-') == 1
+            end
+
+            device_classes.include?(device.device_class)
+          end
+        end
+
+        devices
+      end
+
       # @param client [ConnectAPI] ConnectAPI client.
       # @param platform [String] The platform of the device.
       # @param include_disabled [Bool] Whether to include disable devices. false by default.

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

@@ -1,4 +1,5 @@
-require_relative '../model'
+require_relative '../../connect_api'
+
 module Spaceship
   class ConnectAPI
     class Profile
@@ -70,7 +71,7 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, fields: 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_profiles(filter: filter, includes: includes, fields: fields, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)

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

@@ -94,7 +94,7 @@ module Spaceship
             }
           end
 
-          app_store_verions_data = platforms.map do |platform|
+          data_for_app_store_versions = platforms.map do |platform|
             {
               type: "appStoreVersions",
               id: "${store-version-#{platform}}"
@@ -103,7 +103,7 @@ module Spaceship
 
           relationships = {
             appStoreVersions: {
-              data: app_store_verions_data
+              data: data_for_app_store_versions
             },
             appInfos: {
               data: [
@@ -1254,7 +1254,7 @@ module Spaceship
         # resolutionCenter
         #
         # As of 2022-11-11:
-        # This is not official available throught the App Store Connect API using an API Key.
+        # This is not official available through the App Store Connect API using an API Key.
         # This is only works with Apple ID auth.
         #
 

data/spaceship/lib/spaceship/connect_api.rb

@@ -76,6 +76,8 @@ require 'spaceship/connect_api/models/actor'
 
 module Spaceship
   class ConnectAPI
+    MAX_OBJECTS_PER_PAGE_LIMIT = 200
+
     # Defined in the App Store Connect API docs:
     # https://developer.apple.com/documentation/appstoreconnectapi/platform
     #

data/spaceship/lib/spaceship/portal/app.rb

@@ -141,7 +141,7 @@ module Spaceship
 
       # Delete this App ID. This action will most likely fail if the App ID is already in the store
       # or there are active profiles
-      # @return (App) The app you just deletd
+      # @return (App) The app you just deleted
       def delete!
         client.delete_app!(app_id, mac: mac?)
         self

data/spaceship/lib/spaceship/portal/app_group.rb

@@ -63,7 +63,7 @@ module Spaceship
       end
 
       # Delete this app group
-      # @return (AppGroup) The app group you just deletd
+      # @return (AppGroup) The app group you just deleted
       def delete!
         client.delete_app_group!(app_group_id)
         self

data/spaceship/lib/spaceship/test_flight/client.rb

@@ -8,7 +8,7 @@ module Spaceship
       #
       # This client is solely responsible for the making HTTP requests and
       # parsing their responses. Parameters should be either named parameters, or
-      # for large request data bodies, pass in anything that can resond to
+      # for large request data bodies, pass in anything that can respond to
       # `to_json`.
       #
       # Each request method should validate the required parameters. A required parameter is one that would result in 400-range response if it is not supplied.

data/spaceship/lib/spaceship/test_flight/tester.rb

@@ -94,7 +94,7 @@ module Spaceship
 
       # @return (Spaceship::TestFlight::Tester) Returns the testers matching the parameter.
       # ITC searches all fields, and is full text. The search results are the union of all words in the search text
-      # @param text (String) (required): Value used to filter the tester, case insensitive
+      # @param text (String) (required): Value used to filter the tester, case-insensitive
       def self.search(app_id: nil, text: nil, is_email_exact_match: false)
         text = text.strip
         testers_matching_text = client.search_for_tester_in_app(app_id: app_id, text: text).map { |data| self.new(data) }

data/spaceship/lib/spaceship/tunes/app_details.rb

@@ -11,7 +11,7 @@ module Spaceship
       # Localized values
       ####
 
-      # @return (Array) Raw access the all available languages. You shouldn't use it probbaly
+      # @return (Array) Raw access the all available languages. You shouldn't use it probably
       attr_accessor :languages
 
       # @return (Hash) A hash representing the app name in all languages
@@ -23,7 +23,7 @@ module Spaceship
       # @return (Hash) A hash representing the privacy URL in all languages
       attr_reader :privacy_url
 
-      # @return (Hash) A hash prepresenting the privacy URL in all languages for Apple TV
+      # @return (Hash) A hash representing the privacy URL in all languages for Apple TV
       attr_reader :apple_tv_privacy_policy
 
       # Categories (e.g. MZGenre.Business)

data/spaceship/lib/spaceship/tunes/app_image.rb

@@ -35,7 +35,7 @@ module Spaceship
       end
 
       def setup
-        # Since September 2015 we don't get the url any more, so we have to manually build it
+        # Since September 2015 we don't get the url anymore, so we have to manually build it
         self.url = "#{HOST_URL}/#{self.asset_token}/0x0ss.jpg"
       end