fastlane 2.227.0 → 2.232.2

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

@@ -0,0 +1,62 @@
+require_relative '../model'
+
+module Spaceship
+  class ConnectAPI
+    class Webhook
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :enabled
+      attr_accessor :event_types
+      attr_accessor :name
+      attr_accessor :url
+
+      attr_mapping({
+        "enabled" => "enabled",
+        "eventTypes" => "event_types",
+        "name" => "name",
+        "url" => "url"
+      })
+
+      # Found at https://developer.apple.com/documentation/appstoreconnectapi/webhookeventtype
+      module EventType
+        ALTERNATIVE_DISTRIBUTION_PACKAGE_AVAILABLE_UPDATED = "ALTERNATIVE_DISTRIBUTION_PACKAGE_AVAILABLE_UPDATED"
+        ALTERNATIVE_DISTRIBUTION_PACKAGE_VERSION_CREATED = "ALTERNATIVE_DISTRIBUTION_PACKAGE_VERSION_CREATED"
+        ALTERNATIVE_DISTRIBUTION_TERRITORY_AVAILABILITY_UPDATED = "ALTERNATIVE_DISTRIBUTION_TERRITORY_AVAILABILITY_UPDATED"
+        APP_STORE_VERSION_APP_VERSION_STATE_UPDATED = "APP_STORE_VERSION_APP_VERSION_STATE_UPDATED"
+        BACKGROUND_ASSET_VERSION_APP_STORE_RELEASE_STATE_UPDATED = "BACKGROUND_ASSET_VERSION_APP_STORE_RELEASE_STATE_UPDATED"
+        BACKGROUND_ASSET_VERSION_EXTERNAL_BETA_RELEASE_STATE_UPDATED = "BACKGROUND_ASSET_VERSION_EXTERNAL_BETA_RELEASE_STATE_UPDATED"
+        BACKGROUND_ASSET_VERSION_INTERNAL_BETA_RELEASE_CREATED = "BACKGROUND_ASSET_VERSION_INTERNAL_BETA_RELEASE_CREATED"
+        BACKGROUND_ASSET_VERSION_STATE_UPDATED = "BACKGROUND_ASSET_VERSION_STATE_UPDATED"
+        BETA_FEEDBACK_CRASH_SUBMISSION_CREATED = "BETA_FEEDBACK_CRASH_SUBMISSION_CREATED"
+        BETA_FEEDBACK_SCREENSHOT_SUBMISSION_CREATED = "BETA_FEEDBACK_SCREENSHOT_SUBMISSION_CREATED"
+        BUILD_BETA_DETAIL_EXTERNAL_BUILD_STATE_UPDATED = "BUILD_BETA_DETAIL_EXTERNAL_BUILD_STATE_UPDATED"
+        BUILD_UPLOAD_STATE_UPDATED = "BUILD_UPLOAD_STATE_UPDATED"
+      end
+
+      def self.type
+        return "webhooks"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(client: nil, app_id:, filter: {}, includes: nil, limit: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_webhooks(app_id: app_id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
+      def self.create(client: nil, app_id:, enabled: true, event_types:, name:, secret:, url:)
+        client ||= Spaceship::ConnectAPI
+        resp = client.post_webhook(app_id: app_id, enabled: enabled, event_types: event_types, name: name, secret: secret, url: url)
+        return resp.to_models.first
+      end
+
+      def delete!(client: nil)
+        client ||= Spaceship::ConnectAPI
+        return client.delete_webhook(webhook_id: id)
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/provisioning/provisioning.rb

@@ -77,12 +77,6 @@ module Spaceship
                     type: "bundleIds",
                     id: bundle_id_id
                   }
-                },
-                capability: {
-                  data: {
-                    type: "capabilities",
-                    id: capability_type
-                  }
                 }
               }
             }

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -494,6 +494,15 @@ module Spaceship
           test_flight_request_client.get("#{Version::V1}/apps/#{app_id}/buildDeliveries", params)
         end
 
+        #
+        # buildUploads
+        #
+
+        def get_build_uploads(app_id:, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          test_flight_request_client.get("#{Version::V1}/apps/#{app_id}/buildUploads", params)
+        end
+
         #
         # preReleaseVersions
         #

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

@@ -1242,6 +1242,44 @@ module Spaceship
           params = tunes_request_client.build_params(filter: filter, includes: includes)
           tunes_request_client.get("#{Version::V1}/reviewRejections", params)
         end
+
+        #
+        # webhooks
+        #
+
+        def get_webhooks(app_id:, 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}/apps/#{app_id}/webhooks", params)
+        end
+
+        def post_webhook(app_id:, enabled:, event_types:, name:, secret:, url:)
+          body = {
+            data: {
+              type: "webhooks",
+              attributes: {
+                enabled: enabled,
+                eventTypes: event_types,
+                name: name,
+                secret: secret,
+                url: url
+              },
+              relationships: {
+                app: {
+                  data: {
+                    id: app_id,
+                    type: "apps"
+                  }
+                }
+              }
+            }
+          }
+
+          tunes_request_client.post("#{Version::V1}/webhooks", body)
+        end
+
+        def delete_webhook(webhook_id:)
+          tunes_request_client.delete("#{Version::V1}/webhooks/#{webhook_id}")
+        end
       end
     end
   end

data/spaceship/lib/spaceship/connect_api.rb

@@ -31,6 +31,7 @@ require 'spaceship/connect_api/models/beta_tester'
 require 'spaceship/connect_api/models/beta_tester_metric'
 require 'spaceship/connect_api/models/build'
 require 'spaceship/connect_api/models/build_delivery'
+require 'spaceship/connect_api/models/build_upload'
 require 'spaceship/connect_api/models/build_beta_detail'
 require 'spaceship/connect_api/models/build_bundle'
 require 'spaceship/connect_api/models/build_bundle_file_sizes'
@@ -74,6 +75,7 @@ require 'spaceship/connect_api/models/resolution_center_message'
 require 'spaceship/connect_api/models/resolution_center_thread'
 require 'spaceship/connect_api/models/review_rejection'
 require 'spaceship/connect_api/models/actor'
+require 'spaceship/connect_api/models/webhook'
 
 module Spaceship
   class ConnectAPI

data/spaceship/lib/spaceship/errors.rb

@@ -116,9 +116,11 @@ module Spaceship
 
   # Base class for errors coming from App Store Connect locale changes
   class AppStoreLocaleError < BasicPreferredInfoError
-    def initialize(msg)
-      @message = (msg ? "An exception occurred for locale: #{msg}." : nil)
-      super
+    def initialize(locale, error)
+      error_message = error.respond_to?(:message) ? error.message : error.to_s
+      locale_str = locale || "unknown"
+      @message = "An exception has occurred for locale: #{locale_str}.\nError: #{error_message}"
+      super(@message)
     end
 
     # no need to search github issues since the error is specific
@@ -130,21 +132,21 @@ module Spaceship
   # Raised for localized text errors from App Store Connect
   class AppStoreLocalizationError < AppStoreLocaleError
     def preferred_error_info
-      "#{@message} Check the localization requirements here: https://help.apple.com/app-store-connect/en.lproj/static.html#dev354659071"
+      "#{@message}\nCheck the localization requirements here: https://developer.apple.com/help/app-store-connect/manage-app-information/localize-app-information"
     end
   end
 
   # Raised for localized screenshots errors from App Store Connect
   class AppStoreScreenshotError < AppStoreLocaleError
     def preferred_error_info
-      "#{@message} Check the screenshot requirements here: https://help.apple.com/app-store-connect/en.lproj/static.html#devd274dd925"
+      "#{@message}\nCheck the screenshot requirements here: https://developer.apple.com/help/app-store-connect/reference/screenshot-specifications"
     end
   end
 
   # Raised for localized app preview errors from App Store Connect
   class AppStoreAppPreviewError < AppStoreLocaleError
     def preferred_error_info
-      "#{@message} Check the app preview requirements here: https://help.apple.com/app-store-connect/en.lproj/static.html#dev4e413fcb8"
+      "#{@message}\nCheck the app preview requirements here: https://developer.apple.com/help/app-store-connect/reference/app-preview-specifications"
     end
   end
 end

data/spaceship/lib/spaceship/portal/key.rb

@@ -42,9 +42,28 @@ module Spaceship
       # @param music_id [String] the Music Id id (the autogenerated id, not the user specified identifier "music.com.etc...")
       def self.create(name: nil, apns: nil, device_check: nil, music_id: nil)
         service_config = {}
-        service_config[APNS_ID] = [] if apns
-        service_config[DEVICE_CHECK_ID] = [] if device_check
-        service_config[MUSIC_KIT_ID] = [music_id] if music_id
+
+        if apns
+          service_config[APNS_ID] = {
+            scope: 'team',
+            environment: 'all',
+            identifiers: {}
+          }
+        end
+
+        if device_check
+          service_config[DEVICE_CHECK_ID] = {
+            identifiers: {}
+          }
+        end
+
+        if music_id
+          service_config[MUSIC_KIT_ID] = {
+            identifiers: {
+              music: [music_id]
+            }
+          }
+        end
 
         key = client.create_key!(name: name, service_configs: service_config)
         new(key)

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -10,6 +10,7 @@ require_relative 'provisioning_profile'
 require_relative 'certificate'
 require_relative 'website_push'
 require_relative 'persons'
+require_relative 'key'
 
 module Spaceship
   # rubocop:disable Metrics/ClassLength
@@ -780,13 +781,39 @@ module Spaceship
     def create_key!(name: nil, service_configs: nil)
       fetch_csrf_token_for_keys
 
+      service_configs_requests = (service_configs || {}).map do |service_id, configs|
+        if service_id == Spaceship::Portal::Key::MUSIC_KIT_ID
+          {
+            serviceId: service_id,
+            isNew: true,
+            identifiers: configs[:identifiers] || {}
+          }
+        elsif service_id == Spaceship::Portal::Key::DEVICE_CHECK_ID
+          {
+            serviceId: service_id,
+            isNew: true,
+            identifiers: configs[:identifiers] || {}
+          }
+        elsif service_id == Spaceship::Portal::Key::APNS_ID
+          {
+            serviceId: service_id,
+            isNew: true,
+            identifiers: configs[:identifiers] || {},
+            environment: configs[:environment] || "all",
+            scope: configs[:scope] || "team"
+          }
+        else
+          raise "Unknown service id: #{service_id}"
+        end
+      end
+
       params = {
         name: name,
-        serviceConfigurations: service_configs,
+        serviceConfigurationsRequests: service_configs_requests,
         teamId: team_id
       }
 
-      response = request(:post, 'account/auth/key/create') do |req|
+      response = request(:post, 'account/auth/key/v2/create') do |req|
         req.headers['Content-Type'] = 'application/json'
         req.body = params.to_json
       end

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -68,21 +68,11 @@ module Spaceship
     end
 
     def load_cookies(content)
-      # When Ruby 2.5 support is dropped, we can safely get rid of the latter branch.
-      if YAML.name == 'Psych' && Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1')
-        YAML.safe_load(
-          content,
-          permitted_classes: [HTTP::Cookie, Time],
-          aliases: true
-        )
-      else
-        YAML.safe_load(
-          content,
-          [HTTP::Cookie, Time], # classes allowlist
-          [],                   # symbols allowlist
-          true                  # allow YAML aliases
-        )
-      end
+      YAML.safe_load(
+        content,
+        permitted_classes: [HTTP::Cookie, Time],
+        aliases: true
+      )
     end
 
     def session_string

data/supply/lib/supply/client.rb

@@ -46,7 +46,24 @@ module Supply
     # Initializes the service and its auth_client using the specified information
     # @param service_account_json: The raw service account Json data
     def initialize(service_account_json: nil, params: nil)
-      auth_client = Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: service_account_json, scope: self.class::SCOPE)
+      # decode the json and check its type
+      begin
+        json_content = service_account_json.read
+        google_credentials = JSON.parse(json_content)
+        service_account_json.rewind
+      rescue JSON::ParserError
+        UI.user_error!("Invalid Google Credentials file provided - unable to parse json.")
+      end
+
+      # use correct credential class based on type
+      case google_credentials['type']
+      when "external_account"
+        auth_client = Google::Auth::ExternalAccount::Credentials.make_creds(json_key_io: service_account_json, scope: self.class::SCOPE)
+      when "service_account"
+        auth_client = Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: service_account_json, scope: self.class::SCOPE)
+      else
+        UI.user_error!("Invalid Google Credentials file provided - no credential type found.")
+      end
 
       UI.verbose("Fetching a new access token from Google...")
 

data/trainer/lib/trainer/legacy_xcresult.rb

@@ -570,7 +570,7 @@ module Trainer
             path
           ]
 
-          xcresulttool_cmd << '--legacy' if Trainer::XCResult::Helper.supports_xcode16_xcresulttool?
+          xcresulttool_cmd << '--legacy' if Trainer::XCResult::Helper.supports_xcresulttool_version_23?
 
           xcresulttool_cmd
         end

data/trainer/lib/trainer/test_parser.rb

@@ -101,7 +101,7 @@ module Trainer
       UI.user_error!("File not found at path '#{path}'") unless File.exist?(path)
 
       if File.directory?(path) && path.end_with?(".xcresult")
-        parser = XCResult::Helper.supports_xcode16_xcresulttool? && !config[:force_legacy_xcresulttool] ? XCResult::Parser : LegacyXCResult::Parser
+        parser = XCResult::Helper.supports_xcresulttool_version_23? && !config[:force_legacy_xcresulttool] ? XCResult::Parser : LegacyXCResult::Parser
         self.data = parser.parse_xcresult(path: path, output_remove_retry_attempts: config[:output_remove_retry_attempts])
       else
         file_content = File.read(path)

data/trainer/lib/trainer/xcresult/helper.rb

@@ -38,7 +38,7 @@ module Trainer
       # and replaced it with `xcrun xcresulttool get test-results tests` instead.
       #
       # @return [Boolean] Whether the xcresulttool supports Xcode 16+ commands
-      def self.supports_xcode16_xcresulttool?
+      def self.supports_xcresulttool_version_23?
         # e.g. DEVELOPER_DIR=/Applications/Xcode_16_beta_3.app
         # xcresulttool version 23021, format version 3.53 (current)
         match = `xcrun xcresulttool version`.match(/xcresulttool version (?<version>[\d.]+)/)
@@ -48,6 +48,16 @@ module Trainer
       rescue
         false
       end
+
+      def self.supports_xcresulttool_version_24?
+        # xcresulttool version 24408, schema version: 0.1.0 (legacy commands format version: 3.56)
+        match = `xcrun xcresulttool version`.match(/xcresulttool version (?<version>[\d.]+)/)
+        version = match[:version]
+
+        Gem::Version.new(version) >= Gem::Version.new(24_408)
+      rescue
+        false
+      end
     end
   end
 end