fastlane 2.232.1 → 2.233.0

data/match/lib/match/storage.rb

@@ -46,6 +46,7 @@ module Match
               s3_region: params[:s3_region],
               s3_access_key: params[:s3_access_key],
               s3_secret_access_key: params[:s3_secret_access_key],
+              s3_session_token: params[:s3_session_token],
               s3_bucket: params[:s3_bucket],
               s3_object_prefix: params[:s3_object_prefix],
               readonly: params[:readonly],

data/pilot/lib/pilot/build_manager.rb

@@ -398,7 +398,7 @@ module Pilot
 
     # If App Store Connect API token, use token.
     # If api_key is specified and it is an Individual API Key, don't use token but use username.
-    # If itc_provider was explicitly specified, use it.
+    # If itc_provider or provider_public_id was explicitly specified, use it.
     # If there are multiple teams, infer the provider from the selected team name.
     # If there are fewer than two teams, don't infer the provider.
     def transporter_for_selected_team(options)
@@ -414,24 +414,16 @@ module Pilot
                   api_key
                 end
 
-      # Currently no kind of transporters accept an Individual API Key. Use username and app-specific password instead.
-      # See https://github.com/fastlane/fastlane/issues/22115
-      is_individual_key = !api_key.nil? && api_key[:issuer_id].nil?
-      if is_individual_key
-        api_key = nil
-        api_token = nil
-      end
-
       unless api_token.nil?
         api_token.refresh! if api_token.expired?
-        return FastlaneCore::ItunesTransporter.new(nil, nil, false, nil, api_token.text, altool_compatible_command: true, api_key: api_key)
+        return FastlaneCore::ItunesTransporter.new(nil, nil, false, nil, api_token.text, altool_compatible_command: true, api_key: api_key, provider_public_id: nil)
       end
 
       # Otherwise use username and password
       tunes_client = Spaceship::ConnectAPI.client ? Spaceship::ConnectAPI.client.tunes_client : nil
 
-      generic_transporter = FastlaneCore::ItunesTransporter.new(options[:username], nil, false, options[:itc_provider], altool_compatible_command: true, api_key: api_key)
-      return generic_transporter if options[:itc_provider] || tunes_client.nil?
+      generic_transporter = FastlaneCore::ItunesTransporter.new(options[:username], nil, false, options[:itc_provider], altool_compatible_command: true, api_key: api_key, provider_public_id: options[:provider_public_id])
+      return generic_transporter if options[:itc_provider] || options[:provider_public_id] || tunes_client.nil?
       return generic_transporter unless tunes_client.teams.count > 1
 
       begin

data/pilot/lib/pilot/options.rb

@@ -293,6 +293,10 @@ module Pilot
                                      env_name: "PILOT_ITC_PROVIDER",
                                      description: "The provider short name to be used with the iTMSTransporter to identify your team. This value will override the automatically detected provider short name. To get provider short name run `pathToXcode.app/Contents/Applications/Application\\ Loader.app/Contents/itms/bin/iTMSTransporter -m provider -u 'USERNAME' -p 'PASSWORD' -account_type itunes_connect -v off`. The short names of providers should be listed in the second column",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :provider_public_id,
+                                     env_name: "PILOT_PROVIDER_PUBLIC_ID",
+                                     description: "The provider public ID to be used with altool (--provider-public-id). This value will override the automatically detected provider value for altool uploads. Required after Xcode 26 when your account is associated with multiple providers and using username/app-password authentication",
+                                     optional: true),
         # rubocop:enable Layout/LineLength
 
         # waiting and uploaded build

data/precheck/lib/precheck/rules/rules_data/curse_word_hashes/README.md

@@ -0,0 +1,54 @@
+# Updating Curse Word Hashes for `fastlane precheck`
+
+## What does `precheck/rules/curse_words_rule` do?
+
+It uses the metadata fetched from the App Store by _precheck_ and reviews it word by word, failing if it matches one of the committed terms. 
+
+## What Terms to Hash
+
+According to "Want to improve precheck's rules?" in [precheck's docs](https://docs.fastlane.tools/actions/precheck/), phrases flagged by a reviewer in your recent App Store Rejection.
+
+## Format
+
+These phrases are committed in repo under https://github.com/fastlane/fastlane/tree/master/precheck/lib/precheck/rules/rules_data/curse_word_hashes as sha 256 digest (one way hash).
+
+### Before Generating
+
+Make sure the term you are adding is:
+1. A single word phrase
+2. In all lowercase letters
+3. Void of punctuation 
+
+This criteria mimics the transformations performed on the input data that is getting checked in https://github.com/fastlane/fastlane/tree/master/precheck/lib/precheck/rules/curse_words_rule.rb
+
+### Generating a New Hash
+
+```rb
+irb(main):001:0> require 'digest'
+=> true
+irb(main):002:0> new_term_to_add = "oneword"
+=> "oneword"
+irb(main):003:0> Digest::SHA256.hexdigest(new_term_to_add)
+=> "31be3624bc03aa68bc050cce316dc80cfe1ace3d0f58fa5f5b20c9e781c44a07"
+irb(main):004:0> 
+```
+
+Append this to the end of the file (with a newline afterward).
+
+## How to Test Your Newly Added Term
+
+### Hack at the unit tests to include your phrase
+
+Update the tests in https://github.com/fastlane/fastlane/blob/master/precheck/spec/rules/curse_words_rule_spec.rb to include your new phrase.
+
+```diff
+      let(:happy_item) { TextItemToCheck.new("tacos are really delicious, seriously, I can't even", :description, "description") }
+-     let(:curse_item) { TextItemToCheck.new("please excuse the use of 'shit' in this description", :description, "description") }
++     let(:curse_item) { TextItemToCheck.new("please excuse the use of 'oneword' in this description", :description, "description") }
+
+      it "passes for non-curse item" do
+```
+
+### Update your App's listing and run pre-check
+
+Add your term to your App's description or keywords and run `bundle exec fastlane precheck` to ensure that it fails the check.

data/precheck/lib/precheck/rules/rules_data/curse_word_hashes/en_us.txt

@@ -346,4 +346,5 @@ bc8059fe9118fcf7b2c20a0bf9fdd8111942f2cb4754b45fc0b16916ab679ddb
 9f02f229004cc97cbe3e41ad839a73dab5f68d4c296dd64055317cf90dd11a1a
 dab70d211b90bf5e931b5626bc558850752e107daf995bf9e8cb1a08ca7309bf
 4efb200187aa257858d45bc72b8e590bac33db176aba6576cdd6623655a5a74f
-0be9b885f4a35a18f6af6b1ac0acd7fa4b19993999c3fbf66dd1e3e0c4c753c8
+0be9b885f4a35a18f6af6b1ac0acd7fa4b19993999c3fbf66dd1e3e0c4c753c8
+c6603565c5159fbe846a53e991829d452a1546d41150c0d3c73ddbd7f476ee0d

data/scan/lib/scan/detect_values.rb

@@ -111,7 +111,9 @@ module Scan
 
     def self.default_os_version(os_type)
       @os_versions ||= {}
-      @os_versions[os_type] ||= begin
+      return @os_versions[os_type] if @os_versions.key?(os_type)
+
+      @os_versions[os_type] = begin
         UI.crash!("Unknown platform: #{os_type}") unless PLATFORMS.key?(os_type)
         platform = PLATFORMS[os_type]
 
@@ -128,7 +130,8 @@ module Scan
           sdks_output, status = Open3.capture2('xcodebuild -showsdks -json')
           sdk_version = begin
             raise status unless status.success?
-            JSON.parse(sdks_output).find { |e| e['platform'] == platform[:simulator] }['sdkVersion']
+            entry = JSON.parse(sdks_output).find { |e| e['platform'] == platform[:simulator] }
+            entry['productVersion'] || entry['sdkVersion']
           rescue StandardError => e
             UI.error(e)
             UI.error("xcodebuild CLI broken, please run `xcodebuild` and make sure it works")
@@ -147,7 +150,12 @@ module Scan
           end
 
           # Get OS version corresponding to build
-          Gem::Version.new(FastlaneCore::DeviceManager.runtime_build_os_versions[runtime_build])
+          os_version = FastlaneCore::DeviceManager.runtime_build_os_versions[runtime_build]
+          unless os_version
+            UI.important("Runtime build '#{runtime_build}' not found in installed runtimes, falling back to SDK version '#{sdk_version}'")
+            os_version = sdk_version
+          end
+          Gem::Version.new(os_version)
         end
       end
     end

data/sigh/lib/assets/resign.sh

@@ -152,6 +152,7 @@ usage() {
     echo -e "\t    --use-app-entitlements\t\tExtract app bundle codesigning entitlements and combine with entitlements from new provisioning profile." >&2
     echo -e "\t\t\t\t\t\t\tCan't use together with '-e, --entitlements' option." >&2
     echo -e "\t--keychain-path path\t\t\tSpecify the path to a keychain that /usr/bin/codesign should use." >&2
+    echo -e "\t--pagesize size\t\t\t\tSpecify the page size (in bytes) for codesign. Must be a power of two." >&2
     echo -e "\t-v, --verbose\t\t\t\tVerbose output." >&2
     echo -e "\t-h, --help\t\t\t\tDisplay help message." >&2
     exit 2
@@ -171,11 +172,13 @@ VERSION_NUMBER=""
 SHORT_VERSION=
 BUNDLE_VERSION=
 KEYCHAIN_PATH=
+PAGESIZE=
 RAW_PROVISIONS=()
 PROVISIONS_BY_ID=()
 DEFAULT_PROVISION=""
 TEMP_DIR="_floatsignTemp"
 USE_APP_ENTITLEMENTS=""
+VERBOSE=""
 XCODE_VERSION="$(xcodebuild -version | grep "Xcode" | /usr/bin/cut -f 2 -d ' ')"
 
 # List of plist keys used for reference to and from nested apps and extensions
@@ -226,6 +229,10 @@ while [ "$1" != "" ]; do
             shift
             KEYCHAIN_PATH="$1"
             ;;
+        --pagesize )
+            shift
+            PAGESIZE="$1"
+            ;;
         -v | --verbose )
             VERBOSE="--verbose"
             ;;
@@ -247,6 +254,11 @@ if [ -n "$KEYCHAIN_PATH" ]; then
     KEYCHAIN_FLAG="--keychain $KEYCHAIN_PATH"
 fi
 
+PAGESIZE_ARGS=()
+if [ -n "$PAGESIZE" ]; then
+    PAGESIZE_ARGS=(--pagesize "$PAGESIZE")
+fi
+
 # Log the options
 for provision in "${RAW_PROVISIONS[@]}"; do
     if [[ "$provision" =~ .+=.+ ]]; then
@@ -266,6 +278,7 @@ log "Certificate: '$CERTIFICATE'"
 [[ -n "${SHORT_VERSION}" ]] && log "Specified short version to use: '$SHORT_VERSION'"
 [[ -n "${BUNDLE_VERSION}" ]] && log "Specified bundle version to use: '$BUNDLE_VERSION'"
 [[ -n "${KEYCHAIN_FLAG}" ]] && log "Specified keychain to use: '$KEYCHAIN_PATH'"
+[[ -n "${PAGESIZE}" ]] && log "Specified page size: '$PAGESIZE'"
 [[ -n "${NEW_FILE}" ]] && log "Output file name: '$NEW_FILE'"
 [[ -n "${USE_APP_ENTITLEMENTS}" ]] && log "Extract app entitlements: YES"
 
@@ -549,7 +562,7 @@ function resign {
         do
             if [[ "$assetpack" == *.assetpack ]]; then
                 rm -rf "$assetpack"/_CodeSignature
-                /usr/bin/codesign "${VERBOSE}" --generate-entitlement-der "${KEYCHAIN_FLAG}" -f -s "$CERTIFICATE" "$assetpack"
+                /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der "${KEYCHAIN_FLAG}" -f -s "$CERTIFICATE" "$assetpack"
                 checkStatus
             else
                 log "Ignoring non-assetpack: $assetpack"
@@ -571,7 +584,7 @@ function resign {
                 log "Resigning '$framework'"
                 # Must not quote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
                 # shellcheck disable=SC2086
-                /usr/bin/codesign ${VERBOSE} --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" "$framework"
+                /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" "$framework"
                 checkStatus
             else
                 log "Ignoring non-framework: $framework"
@@ -625,7 +638,7 @@ function resign {
             log "Creating an archived-expanded-entitlements.xcent file for Xcode 9 builds or earlier"
             cp -f "$ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
         fi
-        /usr/bin/codesign "${VERBOSE}" --generate-entitlement-der -f -s "$CERTIFICATE" --entitlements "$ENTITLEMENTS" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der -f -s "$CERTIFICATE" --entitlements "$ENTITLEMENTS" "$APP_PATH"
         checkStatus
     elif  [[ -n "${USE_APP_ENTITLEMENTS}" ]]; then
         # Extract entitlements from provisioning profile and from the app binary
@@ -870,7 +883,7 @@ function resign {
             log "Creating an archived-expanded-entitlements.xcent file for Xcode 9 builds or earlier"
             cp -f "$PATCHED_ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
         fi
-        /usr/bin/codesign "${VERBOSE}" --generate-entitlement-der -f -s "$CERTIFICATE" --entitlements "$PATCHED_ENTITLEMENTS" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der -f -s "$CERTIFICATE" --entitlements "$PATCHED_ENTITLEMENTS" "$APP_PATH"
         checkStatus
     else
         log "Extracting entitlements from provisioning profile"
@@ -884,7 +897,7 @@ function resign {
         fi
         # Must not quote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
         # shellcheck disable=SC2086
-        /usr/bin/codesign ${VERBOSE} --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" --entitlements "$TEMP_DIR/newEntitlements" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" --entitlements "$TEMP_DIR/newEntitlements" "$APP_PATH"
         checkStatus
     fi
 

data/sigh/lib/sigh/commands_generator.rb

@@ -114,6 +114,7 @@ module Sigh
         c.option('--use_app_entitlements', 'Extract app bundle codesigning entitlements and combine with entitlements from new provisioning profile.')
         c.option('-g', '--new_bundle_id STRING', String, 'New application bundle ID (CFBundleIdentifier)')
         c.option('--keychain_path STRING', String, 'Path to the keychain that /usr/bin/codesign should use')
+        c.option('--page_size STRING', String, 'Page size in bytes for codesign --pagesize (power of two)')
 
         c.action do |args, options|
           Sigh::Resign.new.run(options, args)

data/sigh/lib/sigh/manager.rb

@@ -4,7 +4,7 @@ require_relative 'runner'
 
 module Sigh
   class Manager
-    def self.start
+    def self.start(keychain_path: nil)
       path = Sigh::Runner.new.run
 
       return nil unless path
@@ -23,7 +23,7 @@ module Sigh
         # in case it already exists
       end
 
-      install_profile(output) unless Sigh.config[:skip_install]
+      install_profile(output, keychain_path) unless Sigh.config[:skip_install]
 
       puts(output.green)
 
@@ -35,13 +35,13 @@ module Sigh
       DownloadAll.new.download_all(download_xcode_profiles: download_xcode_profiles)
     end
 
-    def self.install_profile(profile)
-      uuid = FastlaneCore::ProvisioningProfile.uuid(profile)
-      name = FastlaneCore::ProvisioningProfile.name(profile)
+    def self.install_profile(profile, keychain_path = nil)
+      uuid = FastlaneCore::ProvisioningProfile.uuid(profile, keychain_path)
+      name = FastlaneCore::ProvisioningProfile.name(profile, keychain_path)
       ENV["SIGH_UDID"] = ENV["SIGH_UUID"] = uuid if uuid
       ENV["SIGH_NAME"] = name if name
 
-      FastlaneCore::ProvisioningProfile.install(profile)
+      FastlaneCore::ProvisioningProfile.install(profile, keychain_path)
     end
   end
 end

data/sigh/lib/sigh/resign.rb

@@ -8,18 +8,18 @@ module Sigh
   class Resign
     def run(options, args)
       # get the command line inputs and parse those into the vars we need...
-      ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path = get_inputs(options, args)
+      ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path, page_size = get_inputs(options, args)
       # ... then invoke our programmatic interface with these vars
-      unless resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
+      unless resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path, page_size)
         UI.user_error!("Failed to re-sign .ipa")
       end
     end
 
-    def self.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
-      self.new.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
+    def self.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path, pagesize = nil)
+      self.new.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path, pagesize)
     end
 
-    def resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
+    def resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path, pagesize = nil)
       resign_path = find_resign_path
 
       if keychain_path
@@ -53,6 +53,7 @@ module Sigh
       bundle_id = "-b '#{new_bundle_id}'" if new_bundle_id
       use_app_entitlements_flag = "--use-app-entitlements" if use_app_entitlements
       specific_keychain = "--keychain-path #{keychain_path.shellescape}" if keychain_path
+      pagesize_option = "--pagesize #{pagesize}" if pagesize
 
       command = [
         resign_path.shellescape,
@@ -68,6 +69,7 @@ module Sigh
         verbose,
         bundle_id,
         specific_keychain,
+        pagesize_option,
         ipa.shellescape # Output path must always be last argument
       ].join(' ')
 
@@ -97,12 +99,13 @@ module Sigh
       new_bundle_id = options.new_bundle_id || nil
       use_app_entitlements = options.use_app_entitlements || nil
       keychain_path = options.keychain_path || nil
+      page_size = options.page_size || nil
 
       if options.provisioning_name
         UI.important("The provisioning_name (-n) option is not applicable to resign. You should use provisioning_profile (-p) instead")
       end
 
-      return ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path
+      return ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path, page_size
     end
 
     def find_resign_path

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

@@ -11,35 +11,37 @@ module Spaceship
       attr_accessor :app_previews
 
       module PreviewType
-        IPHONE_35 = "IPHONE_35"
-        IPHONE_40 = "IPHONE_40"
-        IPHONE_47 = "IPHONE_47"
-        IPHONE_55 = "IPHONE_55"
-        IPHONE_58 = "IPHONE_58"
-        IPHONE_65 = "IPHONE_65"
-        IPHONE_67 = "IPHONE_67"
-
-        IPAD_97 = "IPAD_97"
-        IPAD_105 = "IPAD_105"
-        IPAD_PRO_3GEN_11 = "IPAD_PRO_3GEN_11"
-        IPAD_PRO_129 = "IPAD_PRO_129"
-        IPAD_PRO_3GEN_129 = "IPAD_PRO_3GEN_129"
+        # https://developer.apple.com/documentation/appstoreconnectapi/previewtype
+        IPHONE_35 = "IPHONE_35"  # not supported anymore
+        IPHONE_40 = "IPHONE_40"  # 4"
+        IPHONE_47 = "IPHONE_47"  # 4.7"
+        IPHONE_55 = "IPHONE_55"  # 5.5"
+        IPHONE_58 = "IPHONE_58"  # 6.1"
+        IPHONE_61 = "IPHONE_61"  # 6.3"
+        IPHONE_65 = "IPHONE_65"  # 6.5"
+        IPHONE_67 = "IPHONE_67"  # 6.9"
+
+        IPAD_97 = "IPAD_97" # 9.7"
+        IPAD_105 = "IPAD_105" # 10.5"
+        IPAD_PRO_129 = "IPAD_PRO_129" # 12.9"
+        IPAD_PRO_3GEN_11 = "IPAD_PRO_3GEN_11" # 11"
+        IPAD_PRO_3GEN_129 = "IPAD_PRO_3GEN_129" # 13"
 
         DESKTOP = "DESKTOP"
 
         ALL = [
-          IPHONE_35,
           IPHONE_40,
           IPHONE_47,
           IPHONE_55,
           IPHONE_58,
+          IPHONE_61,
           IPHONE_65,
           IPHONE_67,
 
           IPAD_97,
           IPAD_105,
-          IPAD_PRO_3GEN_11,
           IPAD_PRO_129,
+          IPAD_PRO_3GEN_11,
           IPAD_PRO_3GEN_129,
 
           DESKTOP
@@ -60,9 +62,9 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def self.all(client: nil, app_store_version_localization_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
-        resp = client.get_app_preview_sets(filter: filter, includes: includes, limit: limit, sort: sort)
+        resp = client.get_app_preview_sets(app_store_version_localization_id: app_store_version_localization_id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
       end
 
@@ -106,6 +108,41 @@ module Spaceship
 
         return client.get_app_preview_set(app_preview_set_id: id, includes: "appPreviews").first
       end
+
+      # Validate video resolution (portrait canonical sizes) for provided preview_type.
+      # Returns true if the resolution matches any accepted pair.
+      def self.validate_video_resolution(width, height, preview_type)
+        return false unless width && height
+        if width > height
+          width, height = height, width
+        end
+        # for a list of valid resolutions, look for "Accepted resolutions" at https://developer.apple.com/help/app-store-connect/reference/app-information/app-preview-specifications
+        # resolutions below are sorted by display inch from biggest to smallest (see top of the module)
+        canonical = {
+          # iPhone
+          PreviewType::IPHONE_67 => [[886, 1920]],
+          PreviewType::IPHONE_65 => [[886, 1920]],
+          PreviewType::IPHONE_61 => [[886, 1920]],
+          PreviewType::IPHONE_58 => [[886, 1920]],
+          PreviewType::IPHONE_55 => [[1080, 1920]],
+          PreviewType::IPHONE_47 => [[750, 1334]],
+          PreviewType::IPHONE_40 => [[1080, 1920]],
+
+          # iPad
+          PreviewType::IPAD_PRO_3GEN_129 => [[1200, 1600]],
+          PreviewType::IPAD_PRO_3GEN_11  => [[1200, 1600]],
+          PreviewType::IPAD_PRO_129      => [[1200, 1600], [900, 1200]],
+          PreviewType::IPAD_105          => [[1200, 1600]],
+          PreviewType::IPAD_97           => [[900, 1200]],
+        }
+
+        pairs = canonical[preview_type] || []
+        pairs.any? { |(canon_width, canon_height)| width == canon_width && height == canon_height }
+      end
+
+      def self.preview_type_from_filename(name, preview_types = PreviewType::ALL)
+        preview_types.find { |type| name.to_s.upcase.include?(type) }
+      end
     end
   end
 end

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

@@ -78,8 +78,7 @@ module Spaceship
       def get_app_preview_sets(client: nil, filter: {}, includes: "appPreviews", limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         filter ||= {}
-        filter["appStoreVersionLocalization"] = id
-        return Spaceship::ConnectAPI::AppPreviewSet.all(client: client, filter: filter, includes: includes, limit: limit, sort: sort)
+        return Spaceship::ConnectAPI::AppPreviewSet.all(client: client, app_store_version_localization_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
       rescue => error
         raise Spaceship::AppStoreAppPreviewError.new(@locale, error)
       end

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

@@ -367,9 +367,9 @@ module Spaceship
         # appPreviewSets
         #
 
-        def get_app_preview_sets(filter: {}, includes: nil, limit: nil, sort: nil)
+        def get_app_preview_sets(app_store_version_localization_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
           params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-          tunes_request_client.get("#{Version::V1}/appPreviewSets", params)
+          tunes_request_client.get("#{Version::V1}/appStoreVersionLocalizations/#{app_store_version_localization_id}/appPreviewSets", params)
         end
 
         def get_app_preview_set(app_preview_set_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)

data/trainer/lib/trainer/legacy_xcresult.rb

@@ -502,26 +502,7 @@ module Trainer
 
             # Remove retry attempts from the count and test rows
             if output_remove_retry_attempts
-              test_rows = test_rows.reject do |test_row|
-                remove = false
-
-                identifier = test_row[:identifier]
-                info = tests_by_identifier[identifier]
-
-                # Remove if this row is a retry and is a failure
-                if info[:retry_count] > 0
-                  remove = !(test_row[:failures] || []).empty?
-                end
-
-                # Remove all failure and retry count if test did eventually pass
-                if remove
-                  info[:failure_count] -= 1
-                  info[:retry_count] -= 1
-                  tests_by_identifier[identifier] = info
-                end
-
-                remove
-              end
+              test_rows, tests_by_identifier = remove_retry_attempts(test_rows, tests_by_identifier)
             end
 
             row = {
@@ -549,6 +530,32 @@ module Trainer
           rows
         end
 
+        def remove_retry_attempts(test_rows, tests_by_identifier)
+          # Group test rows by identifier and keep only the last one for each identifier
+          test_rows_by_identifier = test_rows.group_by { |row| row[:identifier] }
+
+          # Update counts for removed retry attempts
+          test_rows_by_identifier.each do |identifier, rows|
+            rows_to_remove = rows[0...-1]
+
+            info = tests_by_identifier[identifier]
+            rows_to_remove.each do |row|
+              if !(row[:failures] || []).empty?
+                info[:failure_count] -= 1
+              elsif row[:skipped] == true
+                info[:skip_count] -= 1
+              end
+              info[:retry_count] -= 1
+            end
+            tests_by_identifier[identifier] = info
+          end
+
+          # Keep only the last row for each identifier
+          filtered_test_rows = test_rows_by_identifier.values.map(&:last)
+
+          [filtered_test_rows, tests_by_identifier]
+        end
+
         def test_summaries_to_configuration_names(test_summaries)
           summary_to_name = {}
           test_summaries.each do |summary|

data/trainer/lib/trainer/xcresult/test_suite.rb

@@ -106,7 +106,10 @@ module Trainer
         # Add test cases
         @test_cases.each do |test_case|
           runs = test_case.to_xml_nodes
-          runs = runs.last(1) if output_remove_retry_attempts
+          # Remove retry attempts: keep only the final run (whether it passes, fails, or is skipped)
+          if output_remove_retry_attempts
+            runs = runs.last(1)
+          end
           runs.each { |node| testsuite.add_element(node) }
         end