fastlane 2.240.1 → 2.241.0

data/spaceship/lib/spaceship/portal/merchant.rb

@@ -46,7 +46,7 @@ module Spaceship
         # @param mac [Bool] Fetches Mac merchant if true
         # @return (Array) Returns all merchants available for this account
         def all(mac: false)
-          client.merchants(mac: mac).map { |merchant| new(merchant) }
+          client.merchants(mac: mac).map { |merchant| new_with_platform(merchant, mac) }
         end
 
         # Creates a new Merchant on the Apple Dev Portal
@@ -57,7 +57,7 @@ module Spaceship
         # @return (Merchant) The Merchant you just created
         def create!(bundle_id: nil, name: nil, mac: false)
           new_merchant = client.create_merchant!(name, bundle_id, mac: mac)
-          new(new_merchant)
+          new_with_platform(new_merchant, mac)
         end
 
         # Find a specific Merchant ID based on the bundle_id
@@ -68,6 +68,131 @@ module Spaceship
             merchant.bundle_id == bundle_id
           end
         end
+
+        # Apple does not return the platform, so we record the one that was asked for.
+        def new_with_platform(attrs, mac)
+          new(attrs).tap { |merchant| merchant.platform = mac ? 'mac' : 'ios' }
+        end
+        private :new_with_platform
+      end
+
+      # Represents a domain registered to an Apple Pay Merchant ID
+      class Domain < PortalBase
+        # @return (String) The identifier of this domain, provided by the Dev Portal
+        # @example
+        #   "UFVN6788YA"
+        attr_accessor :domain_id
+
+        # @return (String) The domain name you registered
+        # @example
+        #   "krausefx.com"
+        attr_accessor :name
+
+        # @return (String) Status of the domain verification
+        # @example
+        #   "verified"
+        attr_accessor :status
+
+        # @return (String) The URL Apple expects to serve the domain association file
+        # @example
+        #   "https://krausefx.com/.well-known/apple-developer-merchantid-domain-association.txt"
+        attr_accessor :path
+
+        # @return (Bool) Can this domain be verified by the current team?
+        attr_accessor :can_verify
+
+        # @return (String) The date this domain's verification expires
+        # @example
+        #   "2026-10-11"
+        attr_accessor :expiration_date
+
+        # @return (String) A human readable version of the expiration date
+        # @example
+        #   "Oct 11, 2026"
+        attr_accessor :expiration_date_string
+
+        # @return (Spaceship::Portal::Merchant) The merchant this domain is registered to
+        #   This is not part of Apple's response, it gets passed in by whoever fetched the domain
+        attr_accessor :merchant
+
+        attr_mapping(
+          'displayId' => :domain_id,
+          'name' => :name,
+          'status' => :status,
+          'path' => :path,
+          'canVerify' => :can_verify,
+          'expirationDate' => :expiration_date,
+          'expirationDateString' => :expiration_date_string
+        )
+
+        # @param attrs [Hash] The domain attributes as returned by the Dev Portal
+        # @param existing_client [Spaceship::Client] The client to use for requests
+        # @param merchant [Merchant] The merchant this domain is registered to
+        def initialize(attrs = {}, existing_client = nil, merchant: nil)
+          super(attrs, existing_client)
+          @merchant = merchant
+        end
+
+        class << self
+          # @param merchant [Merchant] The merchant to fetch the domains of
+          # @return (Array) Returns all domains registered to the given merchant
+          def all(merchant)
+            client.merchant_domains(merchant.merchant_id, mac: merchant.mac?).map do |domain|
+              new(domain, client, merchant: merchant)
+            end
+          end
+
+          # Registers a new domain for a Merchant ID on the Apple Dev Portal
+          #
+          # @param merchant [Merchant] the merchant to register the domain for
+          # @param domain_name [String] the domain name to register
+          # @return (Domain) The Domain you just registered
+          def create!(merchant: nil, domain_name: nil)
+            new_domain = client.create_merchant_domain!(merchant.merchant_id, domain_name, mac: merchant.mac?)
+            new(new_domain, client, merchant: merchant)
+          end
+
+          # Find a specific domain of a merchant based on the domain name
+          #
+          # @param merchant [Merchant] The merchant to search the domains of
+          # @param name [String] the domain name to look for
+          # @return (Domain) The Domain you're looking for. This is nil if the domain can't be found.
+          def find(merchant, name)
+            all(merchant).find do |domain|
+              domain.name == name
+            end
+          end
+        end
+
+        # Downloads the domain association file for this domain. It has to be
+        # served at `path` before Apple is able to verify the domain
+        #
+        # @return (String) The url-safe base64 encoded contents of the file
+        def verification_file
+          client.merchant_domain_get_verification_file(domain_id, mac: merchant.mac?)
+        end
+
+        # Asks Apple to verify this domain. The `verification_file` has to be
+        # served at `path` before calling this
+        #
+        # @return (Hash) The response of the Dev Portal
+        def verify
+          client.merchant_domain_verify(domain_id, mac: merchant.mac?)
+        end
+
+        # Delete this Domain
+        # @return (Domain) The domain you just deleted
+        def delete!
+          client.delete_merchant_domain!(domain_id, merchant.merchant_id, mac: merchant.mac?)
+          self
+        end
+      end
+
+      # @return (Array of Spaceship::Portal::Merchant::Domain) The domains registered to this merchant
+      def domains
+        @domains ||= client.merchant_domains(merchant_id, mac: mac?).map do |domain|
+          Domain.new(domain, client, merchant: self)
+        end
       end
 
       # Delete this Merchant

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

@@ -1,3 +1,5 @@
+require 'base64'
+
 require_relative '../client'
 
 require_relative 'app'
@@ -344,6 +346,62 @@ module Spaceship
       end
     end
 
+    def merchant_domains(merchant_id, mac: false)
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/listDomainsForMerchant", {
+        merchantId: merchant_id,
+        teamId: team_id
+      })
+      parse_response(r, 'domainList')
+    end
+
+    def merchant_domain_get_verification_file(domain_id, mac: false)
+      r = request(:get, "account/#{platform_slug(mac)}/identifiers/downloadDomainVerificationFile", {
+        teamId: team_id,
+        domainId: domain_id
+      })
+      a = parse_response(r)
+      if r.success? && a.kind_of?(String)
+        begin
+          return a if Base64.urlsafe_decode64(a.delete("\r\n")).include?("Apple Inc.")
+        # if not valid pkcs#7 just fall through
+        rescue ArgumentError
+        end
+      end
+      raise UnexpectedResponse.new, "Couldn't download verification file, got this instead: #{a}"
+    end
+
+    def merchant_domain_verify(domain_id, mac: false)
+      ensure_csrf(Spaceship::Portal::Merchant)
+
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/verifyDomain", {
+        domainId: domain_id,
+        teamId: team_id
+      })
+      parse_response(r)
+    end
+
+    def create_merchant_domain!(merchant_id, domain_name, mac: false)
+      ensure_csrf(Spaceship::Portal::Merchant)
+
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/registerDomain", {
+        domainName: domain_name,
+        merchantId: merchant_id,
+        teamId: team_id
+      })
+      parse_response(r, 'domainList').first
+    end
+
+    def delete_merchant_domain!(domain_id, merchant_id, mac: false)
+      ensure_csrf(Spaceship::Portal::Merchant)
+
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/removeDomain", {
+        merchantId: merchant_id,
+        domainId: domain_id,
+        teamId: team_id
+      })
+      parse_response(r)
+    end
+
     def create_merchant!(name, bundle_id, mac: false)
       ensure_csrf(Spaceship::Portal::Merchant)
 

data/spaceship/lib/spaceship/portal/ui/select_team.rb

@@ -31,7 +31,6 @@ module Spaceship
       #     {...}
       #   ]
 
-      # rubocop:disable Require/MissingRequireStatement
       def self.ci?
         if Object.const_defined?("FastlaneCore") && FastlaneCore.const_defined?("Helper")
           return FastlaneCore::Helper.ci?
@@ -45,7 +44,6 @@ module Spaceship
         end
         return true
       end
-      # rubocop:enable Require/MissingRequireStatement
 
       def select_team(team_id: nil, team_name: nil)
         teams = client.teams

data/spaceship/lib/spaceship/portal/website_push.rb

@@ -48,7 +48,7 @@ module Spaceship
         # @param mac [Bool] Fetches Mac website push if true
         # @return (Array) Returns all website push available for this account
         def all(mac: false)
-          client.website_push(mac: mac).map { |website_push| self.new(website_push) }
+          client.website_push(mac: mac).map { |website_push| new_with_platform(website_push, mac) }
         end
 
         # Creates a new Website Push ID on the Apple Dev Portal
@@ -59,7 +59,7 @@ module Spaceship
         # @return (Website Push) The Website Push you just created
         def create!(bundle_id: nil, name: nil, mac: false)
           new_website_push = client.create_website_push!(name, bundle_id, mac: mac)
-          self.new(new_website_push)
+          new_with_platform(new_website_push, mac)
         end
 
         # Find a specific Website Push ID based on the bundle_id
@@ -70,6 +70,12 @@ module Spaceship
             website_push.bundle_id == bundle_id
           end
         end
+
+        # Apple does not return the platform, so we record the one that was asked for.
+        def new_with_platform(attrs, mac)
+          new(attrs).tap { |website_push| website_push.platform = mac ? 'mac' : 'ios' }
+        end
+        private :new_with_platform
       end
 
       # Delete this Website Push ID.

data/spaceship/lib/spaceship/test_flight/client.rb

@@ -286,28 +286,6 @@ module Spaceship
         handle_response(response)
       end
 
-      ##
-      # @!group AppTestInfo
-      ##
-
-      def get_app_test_info(app_id: nil)
-        assert_required_params(__method__, binding)
-
-        response = request(:get, "providers/#{team_id}/apps/#{app_id}/testInfo")
-        handle_response(response)
-      end
-
-      def put_app_test_info(app_id: nil, app_test_info: nil)
-        assert_required_params(__method__, binding)
-
-        response = request(:put) do |req|
-          req.url("providers/#{team_id}/apps/#{app_id}/testInfo")
-          req.body = app_test_info.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
-      end
-
       protected
 
       def handle_response(response)

data/spaceship/lib/spaceship/test_flight.rb

@@ -1,6 +1,5 @@
 require 'spaceship/test_flight/client'
 require 'spaceship/test_flight/base'
-require 'spaceship/test_flight/app_test_info'
 require 'spaceship/test_flight/build'
 require 'spaceship/test_flight/build_trains'
 require 'spaceship/test_flight/beta_review_info'

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -20,10 +20,21 @@ module Spaceship
       elsif r.body.kind_of?(Hash) && r.body["trustedPhoneNumbers"].kind_of?(Array) && r.body["trustedPhoneNumbers"].first.kind_of?(Hash)
         handle_two_factor(r)
       else
+        raise_two_factor_service_errors!(r.body)
         raise "Although response from Apple indicated activated Two-step Verification or Two-factor Authentication, spaceship didn't know how to handle this response: #{r.body}"
       end
     end
 
+    # Apple answers without any way to verify, e.g. when it cannot send the SMS code (-28248). See fastlane#29443.
+    def raise_two_factor_service_errors!(body)
+      errors = body.kind_of?(Hash) ? Array(body["serviceErrors"]) : []
+      return if errors.empty?
+
+      message = errors.map { |error| "#{error['message']} (#{error['code']})" }.join(" ")
+      message += " This Apple ID has no trusted devices: signing in to it on an Apple device adds one." if body["noTrustedDevices"]
+      raise Tunes::Error.new, "Apple could not start two-factor authentication: #{message}"
+    end
+
     def handle_two_step(response)
       if response.body.fetch("securityCode", {})["tooManyCodesLock"].to_s.length > 0
         raise Tunes::Error.new, "Too many verification codes have been sent. Enter the last code you received, use one of your devices, or try again later."

data/supply/lib/supply/options.rb

@@ -108,6 +108,7 @@ module Supply
                                      conflicting_options: [:issuer, :key, :json_key],
                                      optional: true,
                                      description: "The raw content of a Google credentials JSON file (Application Default, Workload Identity, or Service Account), used to authenticate with Google",
+                                     sensitive: true,
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_data_raw),
                                      default_value_dynamic: true,

data/supply/lib/supply.rb

@@ -2,7 +2,6 @@ require 'json'
 require 'supply/options'
 require 'supply/client'
 require 'supply/listing'
-require 'supply/apk_listing'
 require 'supply/image_listing'
 require 'supply/generated_universal_apk'
 require 'supply/release_listing'

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.240.1
+  version: 2.241.0
 platform: ruby
 authors:
-- Helmut Januschka
-- Josh Holtz
-- Danielle Tomlinson
-- Max Ott
-- Stefan Natchev
+- Maksym Grebenets
+- Manu Wallner
+- Jan Piotrowski
 - Fumiya Nakamura
-- Luka Mirosevic
+- Satoshi Namai
+- Jimmy Dee
+- Matthew Ellis
+- Max Ott
+- Łukasz Grabowski
 - Iulian Onofrei
-- Joshua Liebowitz
-- Andrew McBurney
 - Olivier Halligon
-- Daniel Jankowski
-- Felix Krause
-- Matthew Ellis
 - Jérôme Lacoste
+- Helmut Januschka
+- Daniel Jankowski
+- Andrew McBurney
+- Jorge Revuelta H
+- Aaron Brager
+- Josh Holtz
+- Connor Tumbleson
+- Stefan Natchev
+- Luka Mirosevic
 - Manish Rathi
 - Roger Oba
-- Satoshi Namai
-- Łukasz Grabowski
-- Manu Wallner
 - Kohki Miki
-- Aaron Brager
-- Jimmy Dee
-- Maksym Grebenets
-- Jorge Revuelta H
-- Jan Piotrowski
-- Connor Tumbleson
+- Felix Krause
+- Joshua Liebowitz
+- Danielle Tomlinson
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -211,13 +211,33 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: erb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -227,7 +247,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -392,7 +412,7 @@ dependencies:
         version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -402,7 +422,7 @@ dependencies:
         version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -627,20 +647,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -969,6 +989,7 @@ files:
 - deliver/lib/deliver/upload_metadata.rb
 - deliver/lib/deliver/upload_price_tier.rb
 - deliver/lib/deliver/upload_screenshots.rb
+- docs/README.md
 - fastlane/README.md
 - fastlane/lib/assets/ActionDetails.md.erb
 - fastlane/lib/assets/Actions.md.erb
@@ -977,11 +998,12 @@ files:
 - fastlane/lib/assets/AppfileTemplateAndroid
 - fastlane/lib/assets/DefaultFastfileTemplate
 - fastlane/lib/assets/DefaultFastfileTemplate.swift
+- fastlane/lib/assets/TeamTable.md.erb
 - fastlane/lib/assets/completions/completion.bash
 - fastlane/lib/assets/completions/completion.fish
 - fastlane/lib/assets/completions/completion.sh
 - fastlane/lib/assets/completions/completion.zsh
-- fastlane/lib/assets/custom_action_template.rb
+- fastlane/lib/assets/custom_action_template.rb.template
 - fastlane/lib/assets/mailgun_html_template.erb
 - fastlane/lib/assets/report_template.xml.erb
 - fastlane/lib/assets/s3_html_template.erb
@@ -1409,6 +1431,7 @@ files:
 - fastlane_core/lib/fastlane_core/project.rb
 - fastlane_core/lib/fastlane_core/provisioning_profile.rb
 - fastlane_core/lib/fastlane_core/queue_worker.rb
+- fastlane_core/lib/fastlane_core/secrets.rb
 - fastlane_core/lib/fastlane_core/string_filters.rb
 - fastlane_core/lib/fastlane_core/swag.rb
 - fastlane_core/lib/fastlane_core/tag_version.rb
@@ -1547,7 +1570,6 @@ files:
 - precheck/lib/precheck/runner.rb
 - produce/README.md
 - produce/lib/produce.rb
-- produce/lib/produce/available_default_languages.rb
 - produce/lib/produce/cloud_container.rb
 - produce/lib/produce/commands_generator.rb
 - produce/lib/produce/developer_center.rb
@@ -1621,8 +1643,6 @@ files:
 - snapshot/lib/snapshot/reports_generator.rb
 - snapshot/lib/snapshot/reset_simulators.rb
 - snapshot/lib/snapshot/runner.rb
-- snapshot/lib/snapshot/screenshot_flatten.rb
-- snapshot/lib/snapshot/screenshot_rotate.rb
 - snapshot/lib/snapshot/setup.rb
 - snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb
 - snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb
@@ -1766,7 +1786,6 @@ files:
 - spaceship/lib/spaceship/spaceauth_runner.rb
 - spaceship/lib/spaceship/stats_middleware.rb
 - spaceship/lib/spaceship/test_flight.rb
-- spaceship/lib/spaceship/test_flight/app_test_info.rb
 - spaceship/lib/spaceship/test_flight/base.rb
 - spaceship/lib/spaceship/test_flight/beta_review_info.rb
 - spaceship/lib/spaceship/test_flight/build.rb
@@ -1834,7 +1853,6 @@ files:
 - spaceship/lib/spaceship/upgrade_2fa_later_client.rb
 - supply/README.md
 - supply/lib/supply.rb
-- supply/lib/supply/apk_listing.rb
 - supply/lib/supply/client.rb
 - supply/lib/supply/commands_generator.rb
 - supply/lib/supply/generated_universal_apk.rb
@@ -1896,7 +1914,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/produce/lib/produce/available_default_languages.rb

@@ -1,62 +0,0 @@
-module Produce
-  class AvailableDefaultLanguages
-    # If you update this list, you probably also have to update these files:
-    # - fastlane_core/lib/fastlane_core/languages.rb
-    # - spaceship/lib/assets/languageMapping.json
-    # See this pull request for example: https://github.com/fastlane/fastlane/pull/14110
-    def self.all_languages
-      [
-        "Arabic",
-        "Bangla",
-        "Catalan",
-        "Croatian",
-        "Czech",
-        "Brazilian Portuguese",
-        "Danish",
-        "Dutch",
-        "English",
-        "English_Australian",
-        "English_CA",
-        "English_UK",
-        "Finnish",
-        "French",
-        "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",
-        "Tamil",
-        "Telugu",
-        "Thai",
-        "Traditional Chinese",
-        "Turkish",
-        "Ukrainian",
-        "Urdu",
-        "Vietnamese"
-      ]
-    end
-  end
-end

data/snapshot/lib/snapshot/screenshot_flatten.rb

@@ -1,20 +0,0 @@
-require_relative 'module'
-
-module Snapshot
-  # This class takes care of removing the alpha channel of the generated screenshots
-  class ScreenshotFlatten
-    # @param (String) The path in which the screenshots are located in
-    def run(path)
-      UI.message("Removing the alpha channel from generated png files")
-      flatten(path)
-    end
-
-    def flatten(path)
-      Dir.glob([path, '/**/*.png'].join('/')).each do |file|
-        UI.verbose("Removing alpha channel from '#{file}'")
-        `sips -s format bmp '#{file}' &> /dev/null` # &> /dev/null because there is warning because of the extension
-        `sips -s format png '#{file}'`
-      end
-    end
-  end
-end

data/snapshot/lib/snapshot/screenshot_rotate.rb

@@ -1,36 +0,0 @@
-require_relative 'module'
-require 'fastlane_core/fastlane_pty'
-
-module Snapshot
-  # This class takes care of rotating images
-  class ScreenshotRotate
-    require 'shellwords'
-
-    # @param (String) The path in which the screenshots are located in
-    def run(path)
-      UI.verbose("Rotating the screenshots (if necessary)")
-      rotate(path)
-    end
-
-    def rotate(path)
-      Dir.glob([path, '/**/*.png'].join('/')).each do |file|
-        UI.verbose("Rotating '#{file}'")
-
-        command = nil
-        if file.end_with?("landscapeleft.png")
-          command = "sips -r -90 '#{file}'"
-        elsif file.end_with?("landscaperight.png")
-          command = "sips -r 90 '#{file}'"
-        elsif file.end_with?("portrait_upsidedown.png")
-          command = "sips -r 180 '#{file}'"
-        end
-
-        # Only rotate if we need to
-        next unless command
-
-        # Rotate
-        FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: false)
-      end
-    end
-  end
-end