fastlane 2.222.0 → 2.223.1

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -125,6 +125,9 @@ public protocol SnapshotfileProtocol: AnyObject {
     /// Prevents packages from automatically being resolved to versions other than those recorded in the `Package.resolved` file
     var disablePackageAutomaticUpdates: Bool { get }
 
+    /// Lets xcodebuild use a specified package authorization provider (keychain|netrc)
+    var packageAuthorizationProvider: String? { get }
+
     /// The testplan associated with the scheme that should be used for testing
     var testplan: String? { get }
 
@@ -192,6 +195,7 @@ public extension SnapshotfileProtocol {
     var clonedSourcePackagesPath: String? { return nil }
     var skipPackageDependenciesResolution: Bool { return false }
     var disablePackageAutomaticUpdates: Bool { return false }
+    var packageAuthorizationProvider: String? { return nil }
     var testplan: String? { return nil }
     var onlyTesting: String? { return nil }
     var skipTesting: String? { return nil }
@@ -204,4 +208,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.119]
+// FastlaneRunnerAPIVersion [0.9.121]

data/fastlane/swift/formatting/Brewfile.lock.json

@@ -2,45 +2,50 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.54.2",
+        "version": "0.54.5",
         "bottle": {
           "rebuild": 0,
           "root_url": "https://ghcr.io/v2/homebrew/core",
           "files": {
+            "arm64_sequoia": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:3fc57cb9abcbfd64106a3b16f51c8851c9877327553ec5fd9b21683d42b3c18d",
+              "sha256": "3fc57cb9abcbfd64106a3b16f51c8851c9877327553ec5fd9b21683d42b3c18d"
+            },
             "arm64_sonoma": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:81df298cd70628b2149823fa370aa3a6799fa3d794e1541f76f3f4a2d7bedac1",
-              "sha256": "81df298cd70628b2149823fa370aa3a6799fa3d794e1541f76f3f4a2d7bedac1"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:4d1f7565498827bbc53230f01c2fca4a7d082f4ae16d32ae568ba633c090c6ee",
+              "sha256": "4d1f7565498827bbc53230f01c2fca4a7d082f4ae16d32ae568ba633c090c6ee"
             },
             "arm64_ventura": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:c69312fea87da1123deb27e6943e90affe661475571c6ca5967321688b46df8b",
-              "sha256": "c69312fea87da1123deb27e6943e90affe661475571c6ca5967321688b46df8b"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:416b54dc7938754980f9b2d732254ce7a36c401c2df3b68eba47f54db9bb956c",
+              "sha256": "416b54dc7938754980f9b2d732254ce7a36c401c2df3b68eba47f54db9bb956c"
             },
             "arm64_monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:da2a5c24a8132589cee415f4a0754ccc8b39e67e74e06469a3cb6b45d880877a",
-              "sha256": "da2a5c24a8132589cee415f4a0754ccc8b39e67e74e06469a3cb6b45d880877a"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:3b14b0bacb0938c650e2d0d30d1f546ea7bac4feac510be16f09a89abd9f95d4",
+              "sha256": "3b14b0bacb0938c650e2d0d30d1f546ea7bac4feac510be16f09a89abd9f95d4"
             },
             "sonoma": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:5d5e97425579868571f6322c7472793ef0e652b0ccb64248a466f5f6a85d8b0c",
-              "sha256": "5d5e97425579868571f6322c7472793ef0e652b0ccb64248a466f5f6a85d8b0c"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:445a0e38bda1f1dbda7c34dbb75a1b4432c5f0de7f9fa8bd4e03a9220b9bda19",
+              "sha256": "445a0e38bda1f1dbda7c34dbb75a1b4432c5f0de7f9fa8bd4e03a9220b9bda19"
             },
             "ventura": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:402e0e5e117296bee234ef2d657a49ef3397dd898db244a43abe6b02b83b6c48",
-              "sha256": "402e0e5e117296bee234ef2d657a49ef3397dd898db244a43abe6b02b83b6c48"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:508b2e8000078773c7884e17b8d1ca711f4313ba14ff0000f7a28af68b02e71a",
+              "sha256": "508b2e8000078773c7884e17b8d1ca711f4313ba14ff0000f7a28af68b02e71a"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:67abaff7e1f041b060e35e8ad1573737c93866c18a9bb4e84c9fd1d85e2064f2",
-              "sha256": "67abaff7e1f041b060e35e8ad1573737c93866c18a9bb4e84c9fd1d85e2064f2"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:8c367a76ca05ba07ffc38a6bb2f5ee0231d363655ed982284afcb4d685fa524e",
+              "sha256": "8c367a76ca05ba07ffc38a6bb2f5ee0231d363655ed982284afcb4d685fa524e"
             },
             "x86_64_linux": {
               "cellar": "/home/linuxbrew/.linuxbrew/Cellar",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:5c6a46f3995ad0b606c0c8a823b9236998ac512ba8895e8b1c3b35730fc2067d",
-              "sha256": "5c6a46f3995ad0b606c0c8a823b9236998ac512ba8895e8b1c3b35730fc2067d"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:8e8abc969e1b10e7411a92717703c8cd944c7a3f3fd04e2d232918971ae14662",
+              "sha256": "8e8abc969e1b10e7411a92717703c8cd944c7a3f3fd04e2d232918971ae14662"
             }
           }
         }
@@ -82,12 +87,12 @@
         "macOS": "13.6"
       },
       "sonoma": {
-        "HOMEBREW_VERSION": "4.3.10",
+        "HOMEBREW_VERSION": "4.3.24",
         "HOMEBREW_PREFIX": "/opt/homebrew",
         "Homebrew/homebrew-core": "api",
-        "CLT": "15.3.0.0.1.1708646388",
+        "CLT": "16.0.0.0.1.1724870825",
         "Xcode": "15.4",
-        "macOS": "14.5"
+        "macOS": "14.6.1"
       }
     }
   }

data/fastlane/swift/formatting/Rakefile

@@ -8,6 +8,7 @@ task(:brew) do
   raise '`brew` is required. Please install brew. https://brew.sh/' unless system('which brew')
 
   puts('➡️  Brew')
+  sh('brew update')
   sh('brew bundle')
 end
 

data/fastlane_core/lib/fastlane_core/build_watcher.rb

@@ -116,6 +116,11 @@ module FastlaneCore
         # Raise error if more than 1 build is returned
         # This should never happen but need to inform the user if it does
         matched_builds = version_matches.map(&:builds).flatten
+
+        # Need to filter out duplicate builds (which could be a result from the double X.Y.0 and X.Y queries)
+        # See: https://github.com/fastlane/fastlane/issues/22248
+        matched_builds = matched_builds.uniq(&:id)
+
         if matched_builds.size > 1 && !select_latest
           error_builds = matched_builds.map do |build|
             "#{build.app_version}(#{build.version}) for #{build.platform} - #{build.processing_state}"

data/fastlane_core/lib/fastlane_core/project.rb

@@ -341,6 +341,7 @@ module FastlaneCore
       proj << "-derivedDataPath #{options[:derived_data_path].shellescape}" if options[:derived_data_path]
       proj << "-xcconfig #{options[:xcconfig].shellescape}" if options[:xcconfig]
       proj << "-scmProvider system" if options[:use_system_scm]
+      proj << "-packageAuthorizationProvider #{options[:package_authorization_provider].shellescape}" if options[:package_authorization_provider]
 
       xcode_at_least_11 = FastlaneCore::Helper.xcode_at_least?('11.0')
       if xcode_at_least_11 && options[:cloned_source_packages_path]

data/gym/lib/gym/options.rb

@@ -320,7 +320,16 @@ module Gym
                                      description: "Lets xcodebuild use system's scm configuration",
                                      optional: true,
                                      type: Boolean,
-                                     default_value: false)
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :package_authorization_provider,
+                                     env_name: "GYM_PACKAGE_AUTHORIZATION_PROVIDER",
+                                     description: "Lets xcodebuild use a specified package authorization provider (keychain|netrc)",
+                                     optional: true,
+                                     type: String,
+                                     verify_block: proc do |value|
+                                       av = %w(netrc keychain)
+                                       UI.user_error!("Unsupported authorization provider '#{value}', must be: #{av}") unless av.include?(value)
+                                     end)
       ]
     end
   end

data/match/lib/match/change_password.rb

@@ -26,7 +26,8 @@ module Match
         git_url: params[:git_url],
         s3_bucket: params[:s3_bucket],
         s3_skip_encryption: params[:s3_skip_encryption],
-        working_directory: storage.working_directory
+        working_directory: storage.working_directory,
+        force_legacy_encryption: params[:force_legacy_encryption]
       })
       encryption.decrypt_files
 

data/match/lib/match/encryption/encryption.rb

@@ -134,11 +134,11 @@ module Match
 
     # The methods of this class will encrypt or decrypt files in place, by default.
     class MatchFileEncryption
-      def encrypt(file_path:, password:, output_path: nil)
+      def encrypt(file_path:, password:, output_path: nil, version: 2)
         output_path = file_path unless output_path
         data_to_encrypt = File.binread(file_path)
         e = MatchDataEncryption.new
-        data = e.encrypt(data: data_to_encrypt, password: password)
+        data = e.encrypt(data: data_to_encrypt, password: password, version: version)
         File.write(output_path, data)
       end
 

data/match/lib/match/encryption/openssl.rb

@@ -14,18 +14,23 @@ module Match
 
       attr_accessor :working_directory
 
+      attr_accessor :force_legacy_encryption
+
       def self.configure(params)
         return self.new(
           keychain_name: params[:keychain_name],
-          working_directory: params[:working_directory]
+          working_directory: params[:working_directory],
+          force_legacy_encryption: params[:force_legacy_encryption]
         )
       end
 
       # @param keychain_name: The identifier used to store the passphrase in the Keychain
       # @param working_directory: The path to where the certificates are stored
-      def initialize(keychain_name: nil, working_directory: nil)
+      # @param force_legacy_encryption: Force use of legacy EncryptionV1 algorithm
+      def initialize(keychain_name: nil, working_directory: nil, force_legacy_encryption: false)
         self.keychain_name = keychain_name
         self.working_directory = working_directory
+        self.force_legacy_encryption = force_legacy_encryption
       end
 
       def encrypt_files(password: nil)
@@ -33,7 +38,7 @@ module Match
         password ||= fetch_password!
         iterate(self.working_directory) do |current|
           files << current
-          encrypt_specific_file(path: current, password: password)
+          encrypt_specific_file(path: current, password: password, version: force_legacy_encryption ? 1 : 2)
           UI.success("🔒  Encrypted '#{File.basename(current)}'") if FastlaneCore::Globals.verbose?
         end
         UI.success("🔒  Successfully encrypted certificates repo")
@@ -109,10 +114,10 @@ module Match
         return password
       end
 
-      def encrypt_specific_file(path: nil, password: nil)
+      def encrypt_specific_file(path: nil, password: nil, version: nil)
         UI.user_error!("No password supplied") if password.to_s.strip.length == 0
         e = MatchFileEncryption.new
-        e.encrypt(file_path: path, password: password)
+        e.encrypt(file_path: path, password: password, version: version)
       rescue FastlaneCore::Interface::FastlaneError
         raise
       rescue => error

data/match/lib/match/importer.rb

@@ -23,7 +23,8 @@ module Match
         git_url: params[:git_url],
         s3_bucket: params[:s3_bucket],
         s3_skip_encryption: params[:s3_skip_encryption],
-        working_directory: storage.working_directory
+        working_directory: storage.working_directory,
+        force_legacy_encryption: params[:force_legacy_encryption]
       })
       encryption.decrypt_files if encryption
       UI.success("Repo is at: '#{storage.working_directory}'")

data/match/lib/match/nuke.rb

@@ -42,7 +42,8 @@ module Match
         git_url: params[:git_url],
         s3_bucket: params[:s3_bucket],
         s3_skip_encryption: params[:s3_skip_encryption],
-        working_directory: storage.working_directory
+        working_directory: storage.working_directory,
+        force_legacy_encryption: params[:force_legacy_encryption]
       })
       self.encryption.decrypt_files if self.encryption
 

data/match/lib/match/options.rb

@@ -355,6 +355,11 @@ module Match
                                      description: "Skips setting the partition list (which can sometimes take a long time). Setting the partition list is usually needed to prevent Xcode from prompting to allow a cert to be used for signing",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :force_legacy_encryption,
+                                     env_name: "MATCH_FORCE_LEGACY_ENCRYPTION",
+                                     description: "Force encryption to use legacy cbc algorithm for backwards compatibility with older match versions",
+                                     type: Boolean,
+                                     default_value: false),
 
         # other
         FastlaneCore::ConfigItem.new(key: :verbose,

data/match/lib/match/runner.rb

@@ -49,7 +49,8 @@ module Match
         git_url: params[:git_url],
         s3_bucket: params[:s3_bucket],
         s3_skip_encryption: params[:s3_skip_encryption],
-        working_directory: storage.working_directory
+        working_directory: storage.working_directory,
+        force_legacy_encryption: params[:force_legacy_encryption]
       })
       encryption.decrypt_files if encryption
 

data/pilot/lib/pilot/build_manager.rb

@@ -391,6 +391,7 @@ module Pilot
     end
 
     # 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 there are multiple teams, infer the provider from the selected team name.
     # If there are fewer than two teams, don't infer the provider.
@@ -407,6 +408,14 @@ 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)

data/scan/lib/scan/module.rb

@@ -24,7 +24,7 @@ module Scan
 
     def building_mac_catalyst_for_mac?
       return false unless Scan.project
-      Scan.project.supports_mac_catalyst? && Scan.config[:catalyst_platform] == "macos"
+      Scan.config[:catalyst_platform] == "macos" && Scan.project.supports_mac_catalyst?
     end
   end
 

data/scan/lib/scan/options.rb

@@ -537,7 +537,16 @@ module Scan
                                     env_name: "SCAN_FAIL_BUILD",
                                     description: "Should this step stop the build if the tests fail? Set this to false if you're using trainer",
                                     type: Boolean,
-                                    default_value: true)
+                                    default_value: true),
+        FastlaneCore::ConfigItem.new(key: :package_authorization_provider,
+                                    env_name: "SCAN_PACKAGE_AUTHORIZATION_PROVIDER",
+                                    description: "Lets xcodebuild use a specified package authorization provider (keychain|netrc)",
+                                    optional: true,
+                                    type: String,
+                                    verify_block: proc do |value|
+                                      av = %w(netrc keychain)
+                                      UI.user_error!("Unsupported authorization provider '#{value}', must be: #{av}") unless av.include?(value)
+                                    end)
 
       ]
     end

data/snapshot/lib/snapshot/options.rb

@@ -267,6 +267,15 @@ module Snapshot
                                      description: "Prevents packages from automatically being resolved to versions other than those recorded in the `Package.resolved` file",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :package_authorization_provider,
+                                     env_name: "SNAPSHOT_PACKAGE_AUTHORIZATION_PROVIDER",
+                                     description: "Lets xcodebuild use a specified package authorization provider (keychain|netrc)",
+                                     optional: true,
+                                     type: String,
+                                     verify_block: proc do |value|
+                                       av = %w(netrc keychain)
+                                       UI.user_error!("Unsupported authorization provider '#{value}', must be: #{av}") unless av.include?(value)
+                                     end),
         FastlaneCore::ConfigItem.new(key: :testplan,
                                      env_name: "SNAPSHOT_TESTPLAN",
                                      description: "The testplan associated with the scheme that should be used for testing",

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.222.0
+  version: 2.223.1
 platform: ruby
 authors:
-- Olivier Halligon
+- Satoshi Namai
 - Manu Wallner
+- Felix Krause
+- Kohki Miki
 - Max Ott
-- Luka Mirosevic
-- Joshua Liebowitz
-- Iulian Onofrei
-- Łukasz Grabowski
-- Manish Rathi
-- Jimmy Dee
-- Jan Piotrowski
-- Aaron Brager
-- Matthew Ellis
-- Jérôme Lacoste
-- Satoshi Namai
 - Jorge Revuelta H
-- Andrew McBurney
+- Jérôme Lacoste
+- Aaron Brager
+- Olivier Halligon
+- Jimmy Dee
+- Manish Rathi
+- Iulian Onofrei
+- Stefan Natchev
 - Maksym Grebenets
+- Roger Oba
 - Fumiya Nakamura
+- Matthew Ellis
+- Łukasz Grabowski
 - Danielle Tomlinson
-- Felix Krause
-- Kohki Miki
-- Stefan Natchev
 - Josh Holtz
-- Helmut Januschka
-- Roger Oba
 - Daniel Jankowski
+- Andrew McBurney
+- Joshua Liebowitz
+- Jan Piotrowski
+- Helmut Januschka
+- Luka Mirosevic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable