fastlane 2.202.0 → 2.212.1

data/sigh/lib/sigh/options.rb

@@ -47,6 +47,11 @@ module Sigh
                                      is_string: false,
                                      short_option: "-f",
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :include_mac_in_profiles,
+                                     env_name: "SIGH_INCLUDE_MAC_IN_PROFILES",
+                                     description: "Include Apple Silicon Mac devices in provisioning profiles for iOS/iPadOS apps",
+                                     is_string: false,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      short_option: "-a",
                                      env_name: "SIGH_APP_IDENTIFIER",

data/sigh/lib/sigh/runner.rb

@@ -82,10 +82,12 @@ module Sigh
         @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
@@ -251,7 +253,13 @@ module Sigh
           ]
         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,
+            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 = [
@@ -281,7 +289,9 @@ module Sigh
                        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)

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -165,7 +165,7 @@ open class Snapshot: NSObject {
             }
 
             let screenshot = XCUIScreen.main.screenshot()
-            #if os(iOS)
+            #if os(iOS) && !targetEnvironment(macCatalyst)
             let image = XCUIDevice.shared.orientation.isLandscape ?  fixLandscapeOrientation(image: screenshot.image) : screenshot.image
             #else
             let image = screenshot.image
@@ -181,7 +181,7 @@ open class Snapshot: NSObject {
 
                 let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
                 #if swift(<5.0)
-                    UIImagePNGRepresentation(image)?.write(to: path, options: .atomic)
+                    try UIImagePNGRepresentation(image)?.write(to: path, options: .atomic)
                 #else
                     try image.pngData()?.write(to: path, options: .atomic)
                 #endif
@@ -306,4 +306,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.27]
+// SnapshotHelperVersion [1.29]

data/snapshot/lib/snapshot/options.rb

@@ -133,7 +133,7 @@ module Snapshot
                                      is_string: false),
         FastlaneCore::ConfigItem.new(key: :override_status_bar_arguments,
                                      env_name: 'SNAPSHOT_OVERRIDE_STATUS_BAR_ARGUMENTS',
-                                     description: "Fully customize the status bar by setting each option here. See `xcrun simctl status_bar --help`",
+                                     description: "Fully customize the status bar by setting each option here. Requires `override_status_bar` to be set to `true`. See `xcrun simctl status_bar --help`",
                                      optional: true,
                                      type: String),
         FastlaneCore::ConfigItem.new(key: :localize_simulator,

data/snapshot/lib/snapshot/reports_generator.rb

@@ -132,6 +132,7 @@ module Snapshot
         'iPad Pro (12.9-inch)' => 'iPad Pro (12.9-inch)',
         '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 (at 1080p)' => 'Apple TV 4K (at 1080p)',
         'Apple TV 4K' => 'Apple TV 4K',

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

@@ -94,7 +94,11 @@ module Snapshot
         device_udid = TestCommandGenerator.device_udid(device_type)
 
         UI.message("Launch Simulator #{device_type}")
-        Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        if FastlaneCore::Helper.xcode_at_least?("13")
+          Helper.backticks("open -a Simulator.app --args -CurrentDeviceUDID #{device_udid} &> /dev/null")
+        else
+          Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        end
 
         paths.each do |path|
           UI.message("Adding '#{path}'")
@@ -131,7 +135,10 @@ module Snapshot
       if arguments.nil? || arguments.empty?
         # The time needs to be passed as ISO8601 so the simulator formats it correctly
         time = Time.new(2007, 1, 9, 9, 41, 0)
-        arguments = "--time #{time.iso8601} --dataNetwork wifi --wifiMode active --wifiBars 3 --cellularMode active --cellularBars 4 --batteryState charged --batteryLevel 100"
+
+        # If you don't override the operator name, you'll get "Carrier" in the status bar on no-notch devices such as iPhone 8. Pass an empty string to blank it out.
+
+        arguments = "--time #{time.iso8601} --dataNetwork wifi --wifiMode active --wifiBars 3 --cellularMode active --operatorName '' --cellularBars 4 --batteryState charged --batteryLevel 100"
       end
 
       Helper.backticks("xcrun simctl status_bar #{device_udid} override #{arguments} &> /dev/null")

data/spaceship/lib/spaceship/client.rb

@@ -18,6 +18,7 @@ require_relative 'tunes/errors'
 require_relative 'globals'
 require_relative 'provider'
 require_relative 'stats_middleware'
+require_relative 'hashcash'
 
 Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
 
@@ -70,10 +71,10 @@ module Spaceship
 
     # @return (Array) A list of all available teams
     def teams
-      user_details_data['associatedAccounts'].sort_by do |team|
+      user_details_data['availableProviders'].sort_by do |team|
         [
-          team['contentProvider']['name'],
-          team['contentProvider']['contentProviderId']
+          team['name'],
+          team['providerId']
         ]
       end
     end
@@ -124,8 +125,8 @@ module Spaceship
     #  "userName"=>"detlef@krausefx.com"}
     def user_details_data
       return @_cached_user_details if @_cached_user_details
-      r = request(:get, '/WebObjects/iTunesConnect.woa/ra/user/detail')
-      @_cached_user_details = parse_response(r, 'data')
+      r = request(:get, "https://appstoreconnect.apple.com/olympus/v1/session")
+      @_cached_user_details = parse_response(r)
     end
 
     # @return (String) The currently selected Team ID
@@ -135,7 +136,7 @@ module Spaceship
       if teams.count > 1
         puts("The current user is in #{teams.count} teams. Pass a team ID or call `select_team` to choose a team. Using the first one for now.")
       end
-      @current_team_id ||= user_details_data['sessionToken']['contentProviderId']
+      @current_team_id ||= user_details_data['provider']['providerId']
     end
 
     # Set a new team ID which will be used from now on
@@ -144,12 +145,11 @@ module Spaceship
       # following confusing error message
       #
       #     invalid content provider id
-      #
       available_teams = teams.collect do |team|
         {
-          team_id: (team["contentProvider"] || {})["contentProviderId"],
-          public_team_id: (team["contentProvider"] || {})["contentProviderPublicId"],
-          team_name: (team["contentProvider"] || {})["name"]
+          team_id: team["providerId"],
+          public_team_id: team["publicProviderId"],
+          team_name: team["name"]
         }
       end
 
@@ -163,21 +163,10 @@ module Spaceship
       end
 
       response = request(:post) do |req|
-        req.url("https://appstoreconnect.apple.com/olympus/v1/providerSwitchRequests")
-        req.body = {
-          "data": {
-            "type": "providerSwitchRequests",
-            "relationships": {
-              "provider": {
-                "data": {
-                  "type": "providers",
-                  "id": result[:public_team_id]
-                }
-              }
-            }
-          }
-        }.to_json
+        req.url("https://appstoreconnect.apple.com/olympus/v1/session")
+        req.body = { "provider": { "providerId": result[:team_id] } }.to_json
         req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'olympus-ui'
       end
 
       handle_itc_response(response.body)
@@ -502,6 +491,12 @@ module Spaceship
           modified_cookie.gsub!(unescaped_important_cookie, escaped_important_cookie)
         end
 
+        # Fixes issue https://github.com/fastlane/fastlane/issues/21071
+        # On 2023-02-23, Apple added a custom implementation
+        # of hashcash to their auth flow
+        # hashcash = nil
+        hashcash = self.fetch_hashcash
+
         response = request(:post) do |req|
           req.url("https://idmsa.apple.com/appleauth/auth/signin")
           req.body = data.to_json
@@ -510,6 +505,7 @@ module Spaceship
           req.headers['X-Apple-Widget-Key'] = self.itc_service_key
           req.headers['Accept'] = 'application/json, text/javascript'
           req.headers["Cookie"] = modified_cookie if modified_cookie
+          req.headers["X-Apple-HC"] = hashcash if hashcash
         end
       rescue UnauthorizedAccessError
         raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
@@ -546,7 +542,7 @@ module Spaceship
           raise AppleIDAndPrivacyAcknowledgementNeeded.new, "Need to acknowledge to Apple's Apple ID and Privacy statement. " \
                                                             "Please manually log into https://appleid.apple.com (or https://appstoreconnect.apple.com) to acknowledge the statement. " \
                                                             "Your account might also be asked to upgrade to 2FA. " \
-                                                            "Set SPACESHIP_SKIP_2FA_UPGRADE=1 for fastlane to automaticaly bypass 2FA upgrade if possible."
+                                                            "Set SPACESHIP_SKIP_2FA_UPGRADE=1 for fastlane to automatically bypass 2FA upgrade if possible."
         elsif (response['Set-Cookie'] || "").include?("itctx")
           raise "Looks like your Apple ID is not enabled for App Store Connect, make sure to be able to login online"
         else
@@ -557,6 +553,21 @@ module Spaceship
     end
     # rubocop:enable Metrics/PerceivedComplexity
 
+    def fetch_hashcash
+      response = request(:get, "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=#{self.itc_service_key}")
+      headers = response.headers
+
+      bits = headers["X-Apple-HC-Bits"]
+      challenge = headers["X-Apple-HC-Challenge"]
+
+      if bits.nil? || challenge.nil?
+        puts("Unable to find 'X-Apple-HC-Bits' and 'X-Apple-HC-Challenge' to make hashcash")
+        return nil
+      end
+
+      return Spaceship::Hashcash.make(bits: bits, challenge: challenge)
+    end
+
     # Get the `itctx` from the new (22nd May 2017) API endpoint "olympus"
     # Update (29th March 2019) olympus migrates to new appstoreconnect API
     def fetch_olympus_session

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

@@ -157,8 +157,6 @@ module Spaceship
       end
 
       def with_asc_retry(tries = 5, &_block)
-        tries = 1 if Object.const_defined?("SpecHelper")
-
         response = yield
 
         status = response.status if response
@@ -170,9 +168,16 @@ module Spaceship
 
         return response
       rescue UnauthorizedAccessError => error
-        # Catch unathorized access and re-raising
-        # There is no need to try again
-        raise error
+        tries -= 1
+        puts(error) if Spaceship::Globals.verbose?
+        if tries.zero?
+          raise error
+        else
+          msg = "Token has expired or has been revoked! Trying to refresh..."
+          puts(msg) if Spaceship::Globals.verbose?
+          @token.refresh!
+          retry
+        end
       rescue TimeoutRetryError => error
         tries -= 1
         puts(error) if Spaceship::Globals.verbose?

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

@@ -0,0 +1,26 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class Actor
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :actor_type
+      attr_accessor :user_first_name
+      attr_accessor :user_last_name
+      attr_accessor :user_email
+      attr_accessor :api_key_id
+
+      attr_mapping({
+        actorType: 'actor_type',
+        userFirstName: 'user_first_name',
+        userLastName: 'user_last_name',
+        userEmail: 'user_email',
+        apiKeyId: 'api_key_id'
+      })
+
+      def self.type
+        return 'actors'
+      end
+    end
+  end
+end

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

@@ -101,10 +101,12 @@ module Spaceship
         return client.get_app(app_id: app_id, includes: includes).first
       end
 
-      def update(client: nil, attributes: nil, app_price_tier_id: nil, territory_ids: nil)
+      # Updates app attributes, price tier and availability of an app in territories
+      # Check Tunes patch_app method for explanation how to use territory_ids parameter with allow_removing_from_sale to remove app from sale
+      def update(client: nil, attributes: nil, app_price_tier_id: nil, territory_ids: nil, allow_removing_from_sale: false)
         client ||= Spaceship::ConnectAPI
         attributes = reverse_attr_mapping(attributes)
-        return client.patch_app(app_id: id, attributes: attributes, app_price_tier_id: app_price_tier_id, territory_ids: territory_ids)
+        return client.patch_app(app_id: id, attributes: attributes, app_price_tier_id: app_price_tier_id, territory_ids: territory_ids, allow_removing_from_sale: allow_removing_from_sale)
       end
 
       #
@@ -362,9 +364,8 @@ module Spaceship
       def get_build_deliveries(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         filter ||= {}
-        filter[:app] = id
 
-        resps = client.get_build_deliveries(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        resps = client.get_build_deliveries(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
 
@@ -436,7 +437,8 @@ module Spaceship
         filter = {
           state: [
             Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW,
-            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::IN_REVIEW
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::IN_REVIEW,
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::UNRESOLVED_ISSUES
           ].join(","),
           platform: platform
         }

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

@@ -1,4 +1,5 @@
 require_relative '../model'
+require_relative '../../errors'
 module Spaceship
   class ConnectAPI
     class AppInfoLocalization
@@ -32,11 +33,15 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         attributes = reverse_attr_mapping(attributes)
         client.patch_app_info_localization(app_info_localization_id: id, attributes: attributes)
+      rescue
+        raise Spaceship::AppStoreLocalizationError, @locale
       end
 
       def delete!(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         client.delete_app_info_localization(app_info_localization_id: id)
+      rescue
+        raise Spaceship::AppStoreLocalizationError, @locale
       end
     end
   end

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

@@ -17,6 +17,7 @@ module Spaceship
         APP_IPHONE_55 = "APP_IPHONE_55"
         APP_IPHONE_58 = "APP_IPHONE_58"
         APP_IPHONE_65 = "APP_IPHONE_65"
+        APP_IPHONE_67 = "APP_IPHONE_67"
 
         APP_IPAD_97 = "APP_IPAD_97"
         APP_IPAD_105 = "APP_IPAD_105"
@@ -29,6 +30,7 @@ module Spaceship
         IMESSAGE_APP_IPHONE_55 = "IMESSAGE_APP_IPHONE_55"
         IMESSAGE_APP_IPHONE_58 = "IMESSAGE_APP_IPHONE_58"
         IMESSAGE_APP_IPHONE_65 = "IMESSAGE_APP_IPHONE_65"
+        IMESSAGE_APP_IPHONE_67 = "IMESSAGE_APP_IPHONE_67"
 
         IMESSAGE_APP_IPAD_97 = "IMESSAGE_APP_IPAD_97"
         IMESSAGE_APP_IPAD_105 = "IMESSAGE_APP_IPAD_105"
@@ -50,6 +52,7 @@ module Spaceship
           IMESSAGE_APP_IPHONE_55,
           IMESSAGE_APP_IPHONE_58,
           IMESSAGE_APP_IPHONE_65,
+          IMESSAGE_APP_IPHONE_67,
 
           IMESSAGE_APP_IPAD_97,
           IMESSAGE_APP_IPAD_105,
@@ -65,6 +68,7 @@ module Spaceship
           APP_IPHONE_55,
           APP_IPHONE_58,
           APP_IPHONE_65,
+          APP_IPHONE_67,
 
           APP_IPAD_97,
           APP_IPAD_105,
@@ -77,6 +81,7 @@ module Spaceship
           IMESSAGE_APP_IPHONE_55,
           IMESSAGE_APP_IPHONE_58,
           IMESSAGE_APP_IPHONE_65,
+          IMESSAGE_APP_IPHONE_67,
 
           IMESSAGE_APP_IPAD_97,
           IMESSAGE_APP_IPAD_105,

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

@@ -112,7 +112,7 @@ module Spaceship
 
       # @deprecated
       def fetch_age_rating_declaration(client: nil)
-        raise 'AppStoreVersion no longer as AgeRatingDeclaration as of App Store Connect API 1.3 - Use AppInfo instead'
+        raise 'AppStoreVersion no longer has AgeRatingDeclaration as of App Store Connect API 1.3 - Use AppInfo instead'
       end
 
       #

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

@@ -1,6 +1,7 @@
 require_relative '../model'
 require_relative './app_preview_set'
 require_relative './app_screenshot_set'
+require_relative '../../errors'
 
 module Spaceship
   class ConnectAPI
@@ -19,16 +20,16 @@ module Spaceship
       attr_accessor :app_preview_sets
 
       attr_mapping({
-        "description" =>  "description",
-        "locale" =>  "locale",
-        "keywords" =>  "keywords",
-        "marketingUrl" =>  "marketing_url",
-        "promotionalText" =>  "promotional_text",
-        "supportUrl" =>  "support_url",
-        "whatsNew" =>  "whats_new",
-
-        "appScreenshotSets" =>  "app_screenshot_sets",
-        "appPreviewSets" =>  "app_preview_sets"
+        "description" => "description",
+        "locale" => "locale",
+        "keywords" => "keywords",
+        "marketingUrl" => "marketing_url",
+        "promotionalText" => "promotional_text",
+        "supportUrl" => "support_url",
+        "whatsNew" => "whats_new",
+
+        "appScreenshotSets" => "app_screenshot_sets",
+        "appPreviewSets" => "app_preview_sets"
       })
 
       def self.type
@@ -43,23 +44,31 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         resp = client.get_app_store_version_localization(app_store_version_localization_id: app_store_version_localization_id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
+      rescue
+        raise Spaceship::AppStoreLocalizationError, @locale
       end
 
       def self.all(client: nil, app_store_version_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         resp = client.get_app_store_version_localizations(app_store_version_id: app_store_version_id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
+      rescue
+        raise Spaceship::AppStoreLocalizationError, @locale
       end
 
       def update(client: nil, attributes: nil)
         client ||= Spaceship::ConnectAPI
         attributes = reverse_attr_mapping(attributes)
         client.patch_app_store_version_localization(app_store_version_localization_id: id, attributes: attributes)
+      rescue
+        raise Spaceship::AppStoreLocalizationError, @locale
       end
 
       def delete!(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         client.delete_app_store_version_localization(app_store_version_localization_id: id)
+      rescue
+        raise Spaceship::AppStoreLocalizationError, @locale
       end
 
       #
@@ -71,12 +80,16 @@ module Spaceship
         filter ||= {}
         filter["appStoreVersionLocalization"] = id
         return Spaceship::ConnectAPI::AppPreviewSet.all(client: client, filter: filter, includes: includes, limit: limit, sort: sort)
+      rescue
+        raise Spaceship::AppStoreAppPreviewError, @locale
       end
 
       def create_app_preview_set(client: nil, attributes: nil)
         client ||= Spaceship::ConnectAPI
         resp = client.post_app_preview_set(app_store_version_localization_id: id, attributes: attributes)
         return resp.to_models.first
+      rescue
+        raise Spaceship::AppStoreAppPreviewError, @locale
       end
 
       #
@@ -86,12 +99,16 @@ module Spaceship
       def get_app_screenshot_sets(client: nil, filter: {}, includes: "appScreenshots", limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         return Spaceship::ConnectAPI::AppScreenshotSet.all(client: client, app_store_version_localization_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
+      rescue
+        raise Spaceship::AppStoreScreenshotError, @locale
       end
 
       def create_app_screenshot_set(client: nil, attributes: nil)
         client ||= Spaceship::ConnectAPI
         resp = client.post_app_screenshot_set(app_store_version_localization_id: id, attributes: attributes)
         return resp.to_models.first
+      rescue
+        raise Spaceship::AppStoreScreenshotError, @locale
       end
     end
   end

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

@@ -1,4 +1,5 @@
 require_relative '../model'
+require_relative './build_bundle_file_sizes'
 module Spaceship
   class ConnectAPI
     class BuildBundle
@@ -54,6 +55,14 @@ module Spaceship
       def self.type
         return "buildBundles"
       end
+
+      #
+      # API
+      #
+
+      def build_bundle_file_sizes(client: nil)
+        @build_bundle_file_sizes ||= BuildBundleFileSizes.all(client: client, build_bundle_id: id)
+      end
     end
   end
 end

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

@@ -0,0 +1,34 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class BuildBundleFileSizes
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :device_model
+      attr_accessor :os_version
+      attr_accessor :download_bytes
+      attr_accessor :install_bytes
+
+      attr_mapping({
+        "deviceModel" => "device_model",
+        "osVersion" => "os_version",
+        "downloadBytes" => "download_bytes",
+        "installBytes" => "install_bytes"
+      })
+
+      def self.type
+        return "buildBundleFileSizes"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(client: nil, build_bundle_id: nil, limit: 30)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_build_bundles_build_bundle_file_sizes(build_bundle_id: build_bundle_id).all_pages
+        resps.flat_map(&:to_models)
+      end
+    end
+  end
+end

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

@@ -27,7 +27,8 @@ module Spaceship
       def self.all(client: nil, app_id: nil, version: nil, build_number: nil)
         client ||= Spaceship::ConnectAPI
         resps = client.get_build_deliveries(
-          filter: { app: app_id, cfBundleShortVersionString: version, cfBundleVersion: build_number },
+          app_id: app_id,
+          filter: { cfBundleShortVersionString: version, cfBundleVersion: build_number },
           limit: 1
         ).all_pages
         return resps.flat_map(&:to_models)

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

@@ -41,6 +41,7 @@ module Spaceship
         MAC_APP_DEVELOPMENT = "MAC_APP_DEVELOPMENT"
         DEVELOPER_ID_KEXT = "DEVELOPER_ID_KEXT"
         DEVELOPER_ID_APPLICATION = "DEVELOPER_ID_APPLICATION"
+        DEVELOPER_ID_APPLICATION_G2 = "DEVELOPER_ID_APPLICATION_G2"
 
         # As of 2021-11-09, this is only available with Apple ID auth
         DEVELOPER_ID_INSTALLER = "DEVELOPER_ID_INSTALLER"