fastlane 2.233.0 → 2.234.0

data/fastlane/swift/Fastlane.swift

@@ -3331,8 +3331,8 @@ public func copyArtifacts(keepOriginal: OptionalConfigValue<Bool> = .fastlaneDef
  Create Managed Google Play Apps
 
  - parameters:
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account) used to authenticate with Google
    - developerAccountId: The ID of your Google Play Console account. Can be obtained from the URL when you log in (`https://play.google.com/apps/publish/?account=...` or when you 'Obtain private app publishing rights' (https://developers.google.com/android/work/play/custom-app-api/get-started#retrieve_the_developer_account_id)
    - apk: Path to the APK file to upload
    - appTitle: App Title
@@ -4287,8 +4287,8 @@ public func downloadDsyms(apiKeyPath: OptionalConfigValue<String?> = .fastlaneDe
    - metadataPath: Path to the directory containing the metadata files
    - key: **DEPRECATED!** Use `--json_key` instead - The p12 File used to authenticate with Google
    - issuer: **DEPRECATED!** Use `--json_key` instead - The issuer of the p12 file (email address of the service account)
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - rootUrl: Root URL for the Google Play API. The provided URL will be used for API calls in place of https://www.googleapis.com/
    - timeout: Timeout for read, open, and send (in seconds)
 
@@ -4338,8 +4338,8 @@ public func downloadFromPlayStore(packageName: String,
  - parameters:
    - packageName: The package name of the application to use
    - versionCode: The versionCode for which to download the generated APK
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - rootUrl: Root URL for the Google Play API. The provided URL will be used for API calls in place of https://www.googleapis.com/
    - timeout: Timeout for read, open, and send (in seconds)
    - destination: The path on disk where to download the Generated Universal APK
@@ -5594,8 +5594,8 @@ public func githubApi(serverUrl: String = "https://api.github.com",
    - track: The track of the application to use. The default available tracks are: production, beta, alpha, internal
    - key: **DEPRECATED!** Use `--json_key` instead - The p12 File used to authenticate with Google
    - issuer: **DEPRECATED!** Use `--json_key` instead - The issuer of the p12 file (email address of the service account)
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - rootUrl: Root URL for the Google Play API. The provided URL will be used for API calls in place of https://www.googleapis.com/
    - timeout: Timeout for read, open, and send (in seconds)
 
@@ -5643,8 +5643,8 @@ public func googlePlayTrackReleaseNames(packageName: String,
    - track: The track of the application to use. The default available tracks are: production, beta, alpha, internal
    - key: **DEPRECATED!** Use `--json_key` instead - The p12 File used to authenticate with Google
    - issuer: **DEPRECATED!** Use `--json_key` instead - The issuer of the p12 file (email address of the service account)
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - rootUrl: Root URL for the Google Play API. The provided URL will be used for API calls in place of https://www.googleapis.com/
    - timeout: Timeout for read, open, and send (in seconds)
 
@@ -11142,8 +11142,8 @@ public func ssh(username: String,
    - metadataPath: Path to the directory containing the metadata files
    - key: **DEPRECATED!** Use `--json_key` instead - The p12 File used to authenticate with Google
    - issuer: **DEPRECATED!** Use `--json_key` instead - The issuer of the p12 file (email address of the service account)
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - apk: Path to the APK file to upload
    - apkPaths: An array of paths to APK files to upload
    - aab: Path to the AAB file to upload
@@ -12955,8 +12955,8 @@ public func uploadToAppStore(apiKeyPath: OptionalConfigValue<String?> = .fastlan
    - metadataPath: Path to the directory containing the metadata files
    - key: **DEPRECATED!** Use `--json_key` instead - The p12 File used to authenticate with Google
    - issuer: **DEPRECATED!** Use `--json_key` instead - The issuer of the p12 file (email address of the service account)
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - apk: Path to the APK file to upload
    - apkPaths: An array of paths to APK files to upload
    - aab: Path to the AAB file to upload
@@ -13122,8 +13122,8 @@ public func uploadToPlayStore(packageName: String,
 
  - parameters:
    - packageName: The package name of the application to use
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - apk: Path to the APK file to upload
    - apkPaths: An array of paths to APK files to upload
    - aab: Path to the AAB file to upload
@@ -13347,15 +13347,15 @@ public func uploadToTestflight(apiKeyPath: OptionalConfigValue<String?> = .fastl
 }
 
 /**
- Validate that the Google Play Store `json_key` works
+ Validate Google credentials JSON for the Google Play Store
 
  - parameters:
-   - jsonKey: The path to a file containing service account JSON, used to authenticate with Google
-   - jsonKeyData: The raw service account JSON data used to authenticate with Google
+   - jsonKey: The path to a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
+   - jsonKeyData: The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google
    - rootUrl: Root URL for the Google Play API. The provided URL will be used for API calls in place of https://www.googleapis.com/
    - timeout: Timeout for read, open, and send (in seconds)
 
- Use this action to test and validate your private key json key file used to connect and authenticate with the Google Play API
+ Use this action to test and validate your Google credentials JSON file (of type authorized_user, external_account, service_account) used to connect and authenticate with the Google Play API
  */
 public func validatePlayStoreJsonKey(jsonKey: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                      jsonKeyData: OptionalConfigValue<String?> = .fastlaneDefault(nil),
@@ -13976,4 +13976,4 @@ public let snapshotfile: Snapshotfile = .init()
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.198]
+// FastlaneRunnerAPIVersion [0.9.200]

data/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj

@@ -337,7 +337,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 14.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -390,7 +390,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 14.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -404,7 +404,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 14.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
@@ -417,7 +417,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 14.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 			};

data/fastlane/swift/Gymfile.swift

@@ -17,4 +17,4 @@ public class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.233.0
+// Generated with fastlane 2.234.0

data/fastlane/swift/GymfileProtocol.swift

@@ -392,4 +392,4 @@ public extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.148]
+// FastlaneRunnerAPIVersion [0.9.150]

data/fastlane/swift/Matchfile.swift

@@ -17,4 +17,4 @@ public class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.233.0
+// Generated with fastlane 2.234.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -406,4 +406,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.142]
+// FastlaneRunnerAPIVersion [0.9.144]

data/fastlane/swift/Precheckfile.swift

@@ -17,4 +17,4 @@ public class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.233.0
+// Generated with fastlane 2.234.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -84,4 +84,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.141]
+// FastlaneRunnerAPIVersion [0.9.143]

data/fastlane/swift/Scanfile.swift

@@ -17,4 +17,4 @@ public class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.233.0
+// Generated with fastlane 2.234.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -574,4 +574,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.153]
+// FastlaneRunnerAPIVersion [0.9.155]

data/fastlane/swift/Screengrabfile.swift

@@ -17,4 +17,4 @@ public class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.233.0
+// Generated with fastlane 2.234.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -161,4 +161,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.143]
+// FastlaneRunnerAPIVersion [0.9.145]

data/fastlane/swift/Snapshotfile.swift

@@ -17,4 +17,4 @@ public class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.233.0
+// Generated with fastlane 2.234.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -371,4 +371,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.137]
+// FastlaneRunnerAPIVersion [0.9.139]

data/fastlane_core/lib/fastlane_core/clipboard.rb

@@ -14,7 +14,7 @@ module FastlaneCore
     end
 
     def self.is_supported?
-      return `which pbcopy`.length > 0 && `which pbpaste`.length > 0
+      return FastlaneCore::Helper.which('pbcopy') && FastlaneCore::Helper.which('pbpaste')
     end
   end
 end

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -3,6 +3,7 @@ require 'colored'
 require 'tty-spinner'
 require 'pathname'
 
+require_relative 'command_executor'
 require_relative 'fastlane_folder'
 require_relative 'ui/ui'
 require_relative 'env'
@@ -184,7 +185,7 @@ module FastlaneCore
 
     # @return Swift version
     def self.swift_version
-      if system("which swift > /dev/null 2>&1")
+      if self.which('swift')
         output = `swift --version 2> /dev/null`
         return output.split("\n").first.match(/version ([0-9.]+)/).captures.first
       end
@@ -301,6 +302,18 @@ module FastlaneCore
     # helper methods
     #
 
+    # Cross-platform way of finding an executable in the $PATH.
+    # Returns the full path to the executable, or nil if not found.
+    # Unlike shelling out to `which`, this produces no output, making
+    # it suitable for CI environments.
+    #
+    #   Helper.which('ruby') #=> "/usr/bin/ruby"
+    #   Helper.which('not_real') #=> nil
+    #
+    def self.which(cmd)
+      FastlaneCore::CommandExecutor.which(cmd)
+    end
+
     # Runs a given command using backticks (`)
     # and prints them out using the UI.command method
     def self.backticks(command, print: true)

data/fastlane_core/lib/fastlane_core/languages.rb

@@ -11,6 +11,6 @@ module FastlaneCore
     # - produce/lib/produce/available_default_languages.rb
     # - spaceship/lib/assets/languageMapping.json
     # See pull request for example: https://github.com/fastlane/fastlane/pull/14110
-    ALL_LANGUAGES = %w[ar-SA ca cs da de-DE el en-AU en-CA en-GB en-US es-ES es-MX fi fr-CA fr-FR he hi hr hu id it ja ko ms nl-NL no pl pt-BR pt-PT ro ru sk sv th tr uk vi zh-Hans zh-Hant]
+    ALL_LANGUAGES = %w[ar-SA bn-BD ca cs da de-DE el en-AU en-CA en-GB en-US es-ES es-MX fi fr-CA fr-FR gu-IN he hi hr hu id it ja kn-IN ko ml-IN mr-IN ms nl-NL no or-IN pa-IN pl pt-BR pt-PT ro ru sk sl-SI sv ta-IN te-IN th tr uk ur-PK vi zh-Hans zh-Hant]
   end
 end

data/frameit/lib/frameit/dependency_checker.rb

@@ -9,7 +9,7 @@ module Frameit
     end
 
     def self.check_image_magick
-      unless `which convert`.include?("convert")
+      unless FastlaneCore::Helper.which('convert')
         UI.error('#############################################################')
         UI.error("# You have to install the ImageMagick to use FrameIt")
         UI.error("# Install it using 'brew update && brew install imagemagick'")

data/frameit/lib/frameit/device_types.rb

@@ -89,6 +89,17 @@ module Frameit
     STARLIGHT ||= "Starlight"
     SIERRA ||= "Sierra"
     SORTA_SAGE ||= "Sorta Sage"
+    TEAL ||= "Teal"
+    ULTRAMARINE ||= "Ultramarine"
+    BLACK_TITANIUM ||= "Black Titanium"
+    DESERT_TITANIUM ||= "Desert Titanium"
+    NATURAL_TITANIUM ||= "Natural Titanium"
+    WHITE_TITANIUM ||= "White Titanium"
+    COSMIC_ORANGE ||= "Cosmic Orange"
+    DEEP_BLUE ||= "Deep Blue"
+    MIST_BLUE ||= "Mist Blue"
+    SAGE ||= "Sage"
+    LAVENDER ||= "Lavender"
 
     def self.all_colors
       Color.constants.map { |c| Color.const_get(c).upcase.gsub(' ', '_') }
@@ -175,6 +186,13 @@ module Frameit
     IPHONE_14_PLUS ||= Device.new("iphone-14-plus", "Apple iPhone 14 Plus", 12, [[1284, 2778], [2778, 1284]], 458, Color::MIDNIGHT, Platform::IOS)
     IPHONE_14_PRO ||= Device.new("iphone-14-pro", "Apple iPhone 14 Pro", 12, [[1179, 2556], [2556, 1179]], 460, Color::BLACK, Platform::IOS)
     IPHONE_14_PRO_MAX ||= Device.new("iphone14-pro-max", "Apple iPhone 14 Pro Max", 12, [[1290, 2796], [2796, 1290]], 458, Color::BLACK, Platform::IOS)
+    IPHONE_16 ||= Device.new("iphone-16", "Apple iPhone 16", 13, [[1179, 2556], [2556, 1179]], 460, Color::BLACK, Platform::IOS)
+    IPHONE_16_PLUS ||= Device.new("iphone-16-plus", "Apple iPhone 16 Plus", 13, [[1290, 2796], [2796, 1290]], 460, Color::BLACK, Platform::IOS)
+    IPHONE_16_PRO ||= Device.new("iphone-16-pro", "Apple iPhone 16 Pro", 13, [[1206, 2622], [2622, 1206]], 460, Color::NATURAL_TITANIUM, Platform::IOS, DEVICE_SCREEN_IDS[DisplayType::APP_IPHONE_61])
+    IPHONE_16_PRO_MAX ||= Device.new("iphone16-pro-max", "Apple iPhone 16 Pro Max", 13, [[1320, 2868], [2868, 1320]], 460, Color::NATURAL_TITANIUM, Platform::IOS, DEVICE_SCREEN_IDS[DisplayType::APP_IPHONE_67])
+    IPHONE_17 ||= Device.new("iphone-17", "Apple iPhone 17", 14, [[1206, 2622], [2622, 1206]], 460, Color::BLACK, Platform::IOS)
+    IPHONE_17_PRO ||= Device.new("iphone-17-pro", "Apple iPhone 17 Pro", 14, [[1206, 2622], [2622, 1206]], 460, Color::SILVER, Platform::IOS, DEVICE_SCREEN_IDS[DisplayType::APP_IPHONE_61])
+    IPHONE_17_PRO_MAX ||= Device.new("iphone17-pro-max", "Apple iPhone 17 Pro Max", 14, [[1320, 2868], [2868, 1320]], 460, Color::SILVER, Platform::IOS, DEVICE_SCREEN_IDS[DisplayType::APP_IPHONE_67])
     IPAD_10_2 ||= Device.new("ipad-10-2", "Apple iPad 10.2", 1, [[1620, 2160], [2160, 1620]], 264, Color::SPACE_GRAY, Platform::IOS)
     IPAD_AIR_2 ||= Device.new("ipad-air-2", "Apple iPad Air 2", 1, [[1536, 2048], [2048, 1536]], 264, Color::SPACE_GRAY, Platform::IOS, DEVICE_SCREEN_IDS[DisplayType::APP_IPAD_97])
     IPAD_AIR_2019 ||= Device.new("ipad-air-2019", "Apple iPad Air (2019)", 2, [[1668, 2224], [2224, 1668]], 265, Color::SPACE_GRAY, Platform::IOS)

data/frameit/lib/frameit/editor.rb

@@ -109,8 +109,8 @@ module Frameit
         end
       end
 
-      # Apply rounded corners for all iPhone 14 devices
-      if screenshot.device.id.to_s.include?("iphone-14") || screenshot.device.id.to_s.include?("iphone14")
+      # Apply rounded corners for the specifically matched iPhone 14, 16, and 17 device identifiers
+      if ["iphone-14", "iphone14", "iphone-16", "iphone16", "iphone-17", "iphone17"].any? { |id| screenshot.device.id.to_s.include?(id) }
 
         maskData = MiniMagick::Tool::Convert.new do |img|
           img.size("#{screenshot.size[0]}x#{screenshot.size[1]}")

data/match/lib/match/nuke.rb

@@ -168,6 +168,12 @@ module Match
     end
 
     def filter_by_cert
+      certificate_id = self.params[:certificate_id].to_s.strip
+      unless certificate_id.empty?
+        filter_by_certificate_ids([certificate_id], missing_error_message: "No certificate found for certificate_id '#{certificate_id}'")
+        return
+      end
+
       # Force will continue to revoke and delete all certificates and profiles
       return if self.params[:force] || !UI.interactive?
       return if self.certs.count < 2
@@ -198,44 +204,7 @@ module Match
           UI.user_error!("No certificates were selected based on option number(s) entered")
         end
 
-        # Do profile selection logic
-        cert_ids = self.certs.map(&:id)
-        self.profiles = self.profiles.select do |profile|
-          profile_cert_ids = profile.certificates.map(&:id)
-          (cert_ids & profile_cert_ids).any?
-        end
-
-        # Do file selection logic
-        self.files = self.files.select do |f|
-          found = false
-
-          ext = File.extname(f)
-          filename = File.basename(f, ".*")
-
-          # Attempt to find cert based on filename
-          if ext == ".cer" || ext == ".p12"
-            found ||= self.certs.any? do |cert|
-              filename == cert.id.to_s
-            end
-          end
-
-          # Attempt to find profile matched on UUIDs in profile
-          if ext == ".mobileprovision" || ext == ".provisionprofile"
-            storage_uuid = FastlaneCore::ProvisioningProfile.uuid(f)
-
-            found ||= self.profiles.any? do |profile|
-              tmp_file = Tempfile.new
-              tmp_file.write(Base64.decode64(profile.profile_content))
-              tmp_file.close
-
-              # Compare profile uuid in storage to profile uuid on developer portal
-              portal_uuid = FastlaneCore::ProvisioningProfile.uuid(tmp_file.path)
-              storage_uuid == portal_uuid
-            end
-          end
-
-          found
-        end
+        filter_profiles_and_files_by_selected_certificates
       end
     end
 
@@ -358,6 +327,57 @@ module Match
       end
     end
 
+    def filter_by_certificate_ids(certificate_ids, missing_error_message: nil)
+      certificate_ids = certificate_ids.map { |id| id.to_s.strip }.reject(&:empty?)
+      self.certs = self.certs.select do |cert|
+        certificate_ids.include?(cert.id.to_s)
+      end
+
+      UI.user_error!(missing_error_message || "No certificates were selected") if self.certs.empty?
+
+      filter_profiles_and_files_by_selected_certificates
+    end
+
+    def filter_profiles_and_files_by_selected_certificates
+      # Do profile selection logic
+      cert_ids = self.certs.map { |cert| cert.id.to_s }
+      self.profiles = self.profiles.reject do |profile|
+        profile_cert_ids = profile.certificates.map { |cert| cert.id.to_s }
+        (cert_ids & profile_cert_ids).empty?
+      end
+
+      profile_uuids = self.profiles.map do |profile|
+        Tempfile.create("profile") do |tmp_file|
+          tmp_file.binmode
+          tmp_file.write(Base64.decode64(profile.profile_content))
+          tmp_file.flush
+
+          FastlaneCore::ProvisioningProfile.uuid(tmp_file.path)
+        end
+      end
+
+      # Do file selection logic
+      self.files = self.files.select do |f|
+        found = false
+
+        ext = File.extname(f)
+        filename = File.basename(f, ".*")
+
+        # Attempt to find cert based on filename
+        if ext == ".cer" || ext == ".p12"
+          found ||= cert_ids.include?(filename)
+        end
+
+        # Attempt to find profile matched on UUIDs in profile
+        if ext == ".mobileprovision" || ext == ".provisionprofile"
+          storage_uuid = FastlaneCore::ProvisioningProfile.uuid(f)
+          found ||= profile_uuids.include?(storage_uuid)
+        end
+
+        found
+      end
+    end
+
     # The kind of certificate we're interested in
     def certificate_type(type)
       case type.to_sym

data/match/lib/match/storage/git_storage.rb

@@ -141,7 +141,7 @@ module Match
 
       def delete_files(files_to_delete: [], custom_message: nil)
         if files_to_delete.count > 0
-          commands = files_to_delete.map { |filename|  "git rm #{filename.shellescape}" }
+          commands = files_to_delete.map { |filename|  "git --literal-pathspecs rm -- #{filename.shellescape}" }
           git_push(commands: commands, commit_message: custom_message)
         end
       end

data/produce/lib/produce/available_default_languages.rb

@@ -7,6 +7,7 @@ module Produce
     def self.all_languages
       [
         "Arabic",
+        "Bangla",
         "Catalan",
         "Croatian",
         "Czech",
@@ -22,28 +23,38 @@ module Produce
         "French_CA",
         "German",
         "Greek",
+        "Gujarati",
         "Hebrew",
         "Hindi",
         "Hungarian",
         "Indonesian",
         "Italian",
         "Japanese",
+        "Kannada",
         "Korean",
+        "Malayalam",
         "Malay",
+        "Marathi",
         "Norwegian",
+        "Odia",
         "Polish",
         "Portuguese",
+        "Punjabi",
         "Romanian",
         "Russian",
         "Simplified Chinese",
         "Slovak",
+        "Slovenian",
         "Spanish",
         "Spanish_MX",
         "Swedish",
-        "Ukrainian",
+        "Tamil",
+        "Telugu",
         "Thai",
         "Traditional Chinese",
         "Turkish",
+        "Ukrainian",
+        "Urdu",
         "Vietnamese"
       ]
     end

data/scan/lib/scan/detect_values.rb

@@ -90,6 +90,11 @@ module Scan
       default_path = Scan.project.build_settings(key: "BUILT_PRODUCTS_DIR")
       # => /Users/.../Library/Developer/Xcode/DerivedData/app-bqrfaojicpsqnoglloisfftjhksc/Build/Products/Release-iphoneos
       # We got 3 folders up to point to ".../DerivedData/app-[random_chars]/"
+      if default_path.nil?
+        UI.error("Can't retrieve BUILT_PRODUCTS_DIR from the project to detect derived data path.")
+        UI.error("Either set `derived_data_path` explicitly in `scan`, or enable build for running in the scheme.")
+        return
+      end
       default_path = File.expand_path("../../..", default_path)
       UI.verbose("Detected derived data path '#{default_path}'")
       Scan.config[:derived_data_path] = default_path

data/sigh/lib/assets/resign.sh

@@ -249,9 +249,9 @@ while [ "$1" != "" ]; do
     shift
 done
 
-KEYCHAIN_FLAG=
+KEYCHAIN_ARGS=()
 if [ -n "$KEYCHAIN_PATH" ]; then
-    KEYCHAIN_FLAG="--keychain $KEYCHAIN_PATH"
+    KEYCHAIN_ARGS=(--keychain "$KEYCHAIN_PATH")
 fi
 
 PAGESIZE_ARGS=()
@@ -277,7 +277,7 @@ log "Certificate: '$CERTIFICATE'"
 [[ -n "${VERSION_NUMBER}" ]] && log "Specified version number to use: '$VERSION_NUMBER'"
 [[ -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'"
+[[ ${#KEYCHAIN_ARGS[@]} -gt 0 ]] && 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"
@@ -562,7 +562,7 @@ function resign {
         do
             if [[ "$assetpack" == *.assetpack ]]; then
                 rm -rf "$assetpack"/_CodeSignature
-                /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der "${KEYCHAIN_FLAG}" -f -s "$CERTIFICATE" "$assetpack"
+                /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der "${KEYCHAIN_ARGS[@]}" -f -s "$CERTIFICATE" "$assetpack"
                 checkStatus
             else
                 log "Ignoring non-assetpack: $assetpack"
@@ -582,9 +582,7 @@ function resign {
         do
             if [[ "$framework" == *.framework || "$framework" == *.dylib ]]; then
                 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} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" "$framework"
+                /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der "${KEYCHAIN_ARGS[@]}" -f -s "$CERTIFICATE" "$framework"
                 checkStatus
             else
                 log "Ignoring non-framework: $framework"
@@ -895,9 +893,7 @@ function resign {
             log "Creating an archived-expanded-entitlements.xcent file for Xcode 9 builds or earlier"
             cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
         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} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" --entitlements "$TEMP_DIR/newEntitlements" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} "${PAGESIZE_ARGS[@]}" --generate-entitlement-der "${KEYCHAIN_ARGS[@]}" -f -s "$CERTIFICATE" --entitlements "$TEMP_DIR/newEntitlements" "$APP_PATH"
         checkStatus
     fi
 

data/snapshot/lib/snapshot/reports_generator.rb

@@ -84,6 +84,13 @@ module Snapshot
       {
         # snapshot in Xcode 9 saves screenshots with the SIMULATOR_DEVICE_NAME
         # which includes spaces
+        'iPhone 17 Pro Max' => "iPhone 17 Pro Max",
+        'iPhone 17 Pro' => "iPhone 17 Pro",
+        'iPhone 17' => "iPhone 17",
+        'iPhone 16 Pro Max' => "iPhone 16 Pro Max",
+        'iPhone 16 Pro' => "iPhone 16 Pro",
+        'iPhone 16 Plus' => "iPhone 16 Plus",
+        'iPhone 16' => "iPhone 16",
         'iPhone 15 Pro Max' => "iPhone 15 Pro Max",
         'iPhone 15 Pro' => "iPhone 15 Pro",
         'iPhone 15 Plus' => "iPhone 15 Plus",

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

@@ -4,7 +4,7 @@ require_relative 'simulator_launcher_base'
 module Snapshot
   class CPUInspector
     def self.hwprefs_available?
-      `which hwprefs` != ''
+      !!FastlaneCore::Helper.which('hwprefs')
     end
 
     def self.cpu_count