fastlane 2.154.0 → 2.155.0

data/sigh/lib/sigh/module.rb

@@ -5,6 +5,32 @@ module Sigh
   # Use this to just setup the configuration attribute and set it later somewhere else
   class << self
     attr_accessor :config
+
+    def profile_pretty_type(profile_type)
+      require 'spaceship'
+
+      case profile_type
+      when Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_DEVELOPMENT,
+        Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DEVELOPMENT,
+        Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_DEVELOPMENT,
+        Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DEVELOPMENT
+        "Development"
+      when Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_STORE,
+        Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_STORE,
+        Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_STORE,
+        Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_STORE
+        "AppStore"
+      when Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC,
+        Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC
+        "AdHoc"
+      when Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE,
+        Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE
+        "InHouse"
+      when Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT,
+        Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT
+        "Direct"
+      end
+    end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore

data/sigh/lib/sigh/options.rb

@@ -131,12 +131,12 @@ module Sigh
         FastlaneCore::ConfigItem.new(key: :platform,
                                      short_option: '-p',
                                      env_name: "SIGH_PLATFORM",
-                                     description: "Set the provisioning profile's platform (i.e. ios, tvos)",
+                                     description: "Set the provisioning profile's platform (i.e. ios, tvos, macos, catalyst)",
                                      is_string: false,
                                      default_value: "ios",
                                      verify_block: proc do |value|
                                        value = value.to_s
-                                       pt = %w(macos tvos ios)
+                                       pt = %w(macos tvos ios catalyst)
                                        UI.user_error!("Unsupported platform, must be: #{pt}") unless pt.include?(value)
                                      end),
         FastlaneCore::ConfigItem.new(key: :readonly,

data/sigh/lib/sigh/runner.rb

@@ -1,5 +1,7 @@
 require 'spaceship'
 
+require 'base64'
+
 require 'fastlane_core/print_table'
 require 'fastlane_core/cert_checker'
 require_relative 'module'
@@ -42,7 +44,7 @@ module Sigh
 
       UI.user_error!("Something went wrong fetching the latest profile") unless profile
 
-      if profile_type == Spaceship.provisioning_profile.in_house
+      if [Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE, Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE].include?(profile_type)
         ENV["SIGH_PROFILE_ENTERPRISE"] = "1"
       else
         ENV.delete("SIGH_PROFILE_ENTERPRISE")
@@ -55,11 +57,26 @@ module Sigh
     def profile_type
       return @profile_type if @profile_type
 
-      @profile_type = Spaceship.provisioning_profile.app_store
-      @profile_type = Spaceship.provisioning_profile.in_house if Spaceship.client.in_house?
-      @profile_type = Spaceship.provisioning_profile.ad_hoc if Sigh.config[:adhoc]
-      @profile_type = Spaceship.provisioning_profile.direct if Sigh.config[:developer_id]
-      @profile_type = Spaceship.provisioning_profile.development if Sigh.config[:development]
+      case Sigh.config[:platform]
+      when "ios"
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_STORE
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE if Spaceship.client.in_house?
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC if Sigh.config[:adhoc]
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_DEVELOPMENT if Sigh.config[:development]
+      when "tvos"
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_STORE
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE if Spaceship.client.in_house?
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC if Sigh.config[:adhoc]
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_DEVELOPMENT if Sigh.config[:development]
+      when "macos"
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_STORE
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DEVELOPMENT if Sigh.config[:development]
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT if Sigh.config[:developer_id]
+      when "catalyst"
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_STORE
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DEVELOPMENT if Sigh.config[:development]
+        @profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT if Sigh.config[:developer_id]
+      end
 
       @profile_type
     end
@@ -67,9 +84,13 @@ module Sigh
     # Fetches a profile matching the user's search requirements
     def fetch_profiles
       UI.message("Fetching profiles...")
-      results = profile_type.find_by_bundle_id(bundle_id: Sigh.config[:app_identifier],
-                                                     mac: Sigh.config[:platform].to_s == 'macos',
-                                            sub_platform: Sigh.config[:platform].to_s == 'tvos' ? 'tvOS' : nil)
+
+      # Filtering on 'profileType' seems to be undocumented as of 2020-07-30
+      # but works on both web session and official API
+      results = Spaceship::ConnectAPI::Profile.all(filter: { profileType: profile_type }, includes: "bundleId,certificates").select do |profile|
+        profile.bundle_id.identifier == Sigh.config[:app_identifier]
+      end
+
       results = results.find_all do |current_profile|
         if current_profile.valid? || Sigh.config[:force]
           true
@@ -93,7 +114,7 @@ module Sigh
         # "member" and not an a "admin"
         raw_certs = current_profile.certificates.map do |cert|
           begin
-            raw_cert = cert.download_raw
+            raw_cert = Base64.decode64(cert.certificate_content)
           rescue => error
             UI.important("Cannot download cert #{cert.id} - #{error.message}")
             raw_cert = nil
@@ -114,31 +135,45 @@ module Sigh
             UI.message("Certificate for Provisioning Profile '#{current_profile.name}' not available locally: #{current_cert[:cert].id}, skipping this one...")
           end
         end
-        installed && current_profile.certificate_valid?
+
+        # Don't need to check if certificate is valid because it comes with the
+        # profile in the response
+        installed
       end
     end
 
+    def profile_type_pretty_type
+      return Sigh.profile_pretty_type(profile_type)
+    end
+
     # Create a new profile and return it
     def create_profile!
-      cert = certificate_to_use
-      bundle_id = Sigh.config[:app_identifier]
-      name = Sigh.config[:provisioning_name] || [bundle_id, profile_type.pretty_type].join(' ')
+      app_identifier = Sigh.config[:app_identifier]
+      name = Sigh.config[:provisioning_name] || [app_identifier, profile_type_pretty_type].join(' ')
 
       unless Sigh.config[:skip_fetch_profiles]
-        if Spaceship.provisioning_profile.all(mac: Sigh.config[:platform].to_s == 'macos').find { |p| p.name == name }
+        profile = Spaceship::ConnectAPI::Profile.all.find { |p| p.name == name }
+        if profile
           UI.user_error!("The name '#{name}' is already taken, and fail_on_name_taken is true") if Sigh.config[:fail_on_name_taken]
           UI.error("The name '#{name}' is already taken, using another one.")
           name += " #{Time.now.to_i}"
         end
       end
 
+      bundle_id = Spaceship::ConnectAPI::BundleId.find(app_identifier)
+      unless bundle_id
+        UI.user_error!("Could not find App with App Identifier '#{Sigh.config[:app_identifier]}'")
+      end
+
       UI.important("Creating new provisioning profile for '#{Sigh.config[:app_identifier]}' with name '#{name}' for '#{Sigh.config[:platform]}' platform")
-      profile = profile_type.create!(name: name,
-                                bundle_id: bundle_id,
-                              certificate: cert,
-                                      mac: Sigh.config[:platform].to_s == 'macos',
-                             sub_platform: Sigh.config[:platform].to_s == 'tvos' ? 'tvOS' : nil,
-                            template_name: Sigh.config[:template_name])
+
+      profile = Spaceship::ConnectAPI::Profile.create(
+        name: name,
+        profile_type: profile_type,
+        bundle_id_id: bundle_id.id,
+        certificate_ids: [certificate_to_use.id]
+      )
+
       profile
     end
 
@@ -155,16 +190,16 @@ module Sigh
     def certificates_for_profile_and_platform
       case Sigh.config[:platform].to_s
       when 'ios', 'tvos'
-        if profile_type == Spaceship.provisioning_profile.Development
+        if profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_DEVELOPMENT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_DEVELOPMENT
           certificates = Spaceship.certificate.development.all +
                          Spaceship.certificate.apple_development.all
-        elsif profile_type == Spaceship.provisioning_profile.InHouse
+        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE
           # Enterprise accounts don't have access to Apple Distribution certificates
           certificates = Spaceship.certificate.in_house.all
         # handles case where the desired certificate type is adhoc but the account is an enterprise account
         # the apple dev portal api has a weird quirk in it where if you query for distribution certificates
         # for enterprise accounts, you get nothing back even if they exist.
-        elsif profile_type == Spaceship.provisioning_profile.AdHoc && Spaceship.client && Spaceship.client.in_house?
+        elsif (profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC) && Spaceship.client && Spaceship.client.in_house?
           # Enterprise accounts don't have access to Apple Distribution certificates
           certificates = Spaceship.certificate.in_house.all
         else
@@ -173,14 +208,14 @@ module Sigh
                          Spaceship.certificate.apple_distribution.all
         end
 
-      when 'macos'
-        if profile_type == Spaceship.provisioning_profile.Development
+      when 'macos', 'catalyst'
+        if profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DEVELOPMENT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DEVELOPMENT
           certificates = Spaceship.certificate.mac_development.all +
                          Spaceship.certificate.apple_development.all
-        elsif profile_type == Spaceship.provisioning_profile.AppStore
+        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_STORE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_STORE
           certificates = Spaceship.certificate.mac_app_distribution.all +
                          Spaceship.certificate.apple_distribution.all
-        elsif profile_type == Spaceship.provisioning_profile.Direct
+        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT
           certificates = Spaceship.certificate.developer_id_application.all
         else
           certificates = Spaceship.certificate.mac_app_distribution.all +
@@ -235,7 +270,7 @@ module Sigh
         filters << "Owner Name: '#{Sigh.config[:cert_owner_name]}' " if Sigh.config[:cert_owner_name]
         filters << "Certificate ID: '#{Sigh.config[:cert_id]}' " if Sigh.config[:cert_id]
         UI.important("No certificates for filter: #{filters}") if filters.length > 0
-        message = "Could not find a matching code signing identity for type '#{profile_type.to_s.split(':').last}'. "
+        message = "Could not find a matching code signing identity for type '#{profile_type_pretty_type}'. "
         message += "It is recommended to use match to manage code signing for you, more information on https://codesigning.guide. "
         message += "If you don't want to do so, you can also use cert to generate a new one: https://fastlane.tools/cert"
         UI.user_error!(message)
@@ -248,13 +283,15 @@ module Sigh
     # Downloads and stores the provisioning profile
     def download_profile(profile)
       UI.important("Downloading provisioning profile...")
-      profile_name ||= "#{profile_type.pretty_type}_#{Sigh.config[:app_identifier]}"
+      profile_name ||= "#{profile_type_pretty_type}_#{Sigh.config[:app_identifier]}"
 
       if Sigh.config[:platform].to_s == 'tvos'
         profile_name += "_tvos"
+      elsif Sigh.config[:platform].to_s == 'catalyst'
+        profile_name += "_catalyst"
       end
 
-      if Sigh.config[:platform].to_s == 'macos'
+      if ['macos', 'catalyst'].include?(Sigh.config[:platform].to_s)
         profile_name += '.provisionprofile'
       else
         profile_name += '.mobileprovision'
@@ -263,7 +300,8 @@ module Sigh
       tmp_path = Dir.mktmpdir("profile_download")
       output_path = File.join(tmp_path, profile_name)
       File.open(output_path, "wb") do |f|
-        f.write(profile.download)
+        content = Base64.decode64(profile.profile_content)
+        f.write(content)
       end
 
       UI.success("Successfully downloaded provisioning profile...")
@@ -272,7 +310,10 @@ module Sigh
 
     # Makes sure the current App ID exists. If not, it will show an appropriate error message
     def ensure_app_exists!
-      return if Spaceship::App.find(Sigh.config[:app_identifier], mac: Sigh.config[:platform].to_s == 'macos')
+      # Only ensuring by app identifier
+      # We used to ensure by platform (IOS and MAC_OS) but now apps are
+      # always UNIVERSAL as of 2020-07-30
+      return if Spaceship::ConnectAPI::BundleId.find(Sigh.config[:app_identifier])
       print_produce_command(Sigh.config)
       UI.user_error!("Could not find App with App Identifier '#{Sigh.config[:app_identifier]}'")
     end

data/snapshot/lib/snapshot/options.rb

@@ -278,6 +278,11 @@ module Snapshot
                                      env_name: "SNAPSHOT_DISABLE_XCPRETTY",
                                      description: "Disable xcpretty formatting of build",
                                      type: Boolean,
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :suppress_xcode_output,
+                                     env_name: "SNAPSHOT_SUPPRESS_XCODE_OUTPUT",
+                                     description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
+                                     type: Boolean,
                                      optional: true)
       ]
     end

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -33,8 +33,9 @@ module Snapshot
 
         xcpretty = "xcpretty #{Snapshot.config[:xcpretty_args]}"
         xcpretty << "--no-color" if Helper.colors_disabled?
-
-        return pipe << "| #{xcpretty}"
+        pipe << "| #{xcpretty}"
+        pipe << "> /dev/null" if Snapshot.config[:suppress_xcode_output]
+        return pipe
       end
 
       def destination(devices)

data/snapshot/lib/snapshot/test_command_generator_xcode_8.rb

@@ -24,7 +24,10 @@ module Snapshot
 
       def pipe(device_type, language, locale)
         log_path = xcodebuild_log_path(device_type: device_type, language: language, locale: locale)
-        return ["| tee #{log_path.shellescape} | xcpretty #{Snapshot.config[:xcpretty_args]}"]
+        pipe = ["| tee #{log_path.shellescape}"]
+        pipe << "| xcpretty #{Snapshot.config[:xcpretty_args]}"
+        pipe << "> /dev/null" if Snapshot.config[:suppress_xcode_output]
+        return pipe
       end
 
       def destination(device_name)

data/spaceship/lib/spaceship/connect_api/client.rb

@@ -164,6 +164,8 @@ module Spaceship
 
         raise UnexpectedResponse, "Temporary App Store Connect error: #{response.body}" if response.body['statusCode'] == 'ERROR'
 
+        store_csrf_tokens(response)
+
         return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, client: self)
       end
 

data/spaceship/lib/spaceship/connect_api/model.rb

@@ -152,7 +152,7 @@ module Spaceship
               id == included_data["id"] && type == included_data["type"]
             end
 
-            inflate_model(relationship_data, included)
+            inflate_model(relationship_data, included) if relationship_data
           end
 
           # Map a hash or an array of data

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

@@ -10,6 +10,7 @@ module Spaceship
       attr_accessor :bundle_id
       attr_accessor :sku
       attr_accessor :primary_locale
+      attr_accessor :is_opted_in_to_distribute_ios_app_on_mac_app_store
       attr_accessor :removed
       attr_accessor :is_aag
       attr_accessor :available_in_new_territories
@@ -26,6 +27,7 @@ module Spaceship
         "bundleId" => "bundle_id",
         "sku" => "sku",
         "primaryLocale" => "primary_locale",
+        "isOptedInToDistributeIosAppOnMacAppStore" => "is_opted_in_to_distribute_ios_app_on_mac_app_store",
         "removed" => "removed",
         "isAAG" => "is_aag",
         "availableInNewTerritories" => "available_in_new_territories",
@@ -186,7 +188,7 @@ module Spaceship
 
         # Get the latest version
         return get_app_store_versions(filter: filter, includes: includes)
-               .sort_by { |v| Gem::Version.new(v.version_string) }
+               .sort_by { |v| Date.parse(v.created_date) }
                .last
       end
 

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

@@ -1,4 +1,5 @@
 require_relative '../model'
+require_relative './bundle_id_capability'
 module Spaceship
   class ConnectAPI
     class BundleId
@@ -20,15 +21,20 @@ module Spaceship
         "bundleIdCapabilities" => 'bundle_id_capabilities'
       })
 
-      module Platform
-        IOS = "IOS"
-        MAC_OS = "MAC_OS"
-      end
-
       def self.type
         return "bundleIds"
       end
 
+      #
+      # Helpers
+      #
+
+      def supports_catalyst?
+        return bundle_id_capabilities.any? do |capability|
+          capability.is_type?(Spaceship::ConnectAPI::BundleIdCapability::Type::MARZIPAN)
+        end
+      end
+
       #
       # API
       #
@@ -38,6 +44,12 @@ module Spaceship
         return resps.flat_map(&:to_models)
       end
 
+      def self.find(identifier, includes: nil)
+        return all(filter: { identifier: identifier }, includes: includes).find do |app|
+          app.identifier == identifier
+        end
+      end
+
       def self.get(bundle_id_id: nil, includes: nil)
         return Spaceship::ConnectAPI.get_bundle_id(bundle_id_id: bundle_id_id, includes: includes).first
       end

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

@@ -4,23 +4,57 @@ module Spaceship
     class BundleIdCapability
       include Spaceship::ConnectAPI::Model
 
-      attr_accessor :capabilityType
-      attr_accessor :bundleIdCapabilitiesSettingOption
+      attr_accessor :capability_type
+      attr_accessor :settings
 
       attr_mapping({
-        "capabilityType" => "capabilityType",
-        "settings" => "email"
+        "capabilityType" => "capability_type",
+        "settings" => "settings"
       })
 
-      module Platform
-        IOS = "IOS"
-        MAC_OS = "MAC_OS"
+      module Type
+        ICLOUD = "ICLOUD"
+        IN_APP_PURCHASE = "IN_APP_PURCHASE"
+        GAME_CENTER = "GAME_CENTER"
+        PUSH_NOTIFICATIONS = "PUSH_NOTIFICATIONS"
+        WALLET = "WALLET"
+        INTER_APP_AUDIO = "INTER_APP_AUDIO"
+        MAPS = "MAPS"
+        ASSOCIATED_DOMAINS = "ASSOCIATED_DOMAINS"
+        PERSONAL_VPN = "PERSONAL_VPN"
+        APP_GROUPS = "APP_GROUPS"
+        HEALTHKIT = "HEALTHKIT"
+        HOMEKIT = "HOMEKIT"
+        WIRELESS_ACCESSORY_CONFIGURATION = "WIRELESS_ACCESSORY_CONFIGURATION"
+        APPLE_PAY = "APPLE_PAY"
+        DATA_PROTECTION = "DATA_PROTECTION"
+        SIRIKIT = "SIRIKIT"
+        NETWORK_EXTENSIONS = "NETWORK_EXTENSIONS"
+        MULTIPATH = "MULTIPATH"
+        HOT_SPOT = "HOT_SPOT"
+        NFC_TAG_READING = "NFC_TAG_READING"
+        CLASSKIT = "CLASSKIT"
+        AUTOFILL_CREDENTIAL_PROVIDER = "AUTOFILL_CREDENTIAL_PROVIDER"
+        ACCESS_WIFI_INFORMATION = "ACCESS_WIFI_INFORMATION"
+
+        # Undocumented as of 2020-06-09
+        MARZIPAN = "MARZIPAN" # Catalyst
       end
 
       def self.type
         return "bundleIdCapabilities"
       end
 
+      #
+      # Helpers
+      #
+
+      def is_type?(type)
+        # JWT session returns type under "capability_type" attribute
+        # Web session returns type under "id" attribute but with "P7GJR49W72_" prefixed
+        return capability_type == type || id.end_with?(type)
+      end
+
       #
       # API
       #