fastlane 2.195.0 → 2.213.0

data/fastlane_core/lib/fastlane_core/ui/implementations/shell.rb

@@ -86,11 +86,13 @@ module FastlaneCore
 
     def header(message)
       format = format_string
-      if message.length + 8 < TTY::Screen.width - format.length
+      # clamp to zero to prevent negative argument error below
+      available_width = [0, TTY::Screen.width - format.length].max
+      if message.length + 8 < available_width
         message = "--- #{message} ---"
         i = message.length
       else
-        i = TTY::Screen.width - format.length
+        i = available_width
       end
       success("-" * i)
       success(message)

data/frameit/lib/frameit/device.rb

@@ -51,7 +51,7 @@ module Frameit
       found_device = nil
       filename_device = nil
       filename = Pathname.new(path).basename.to_s
-      Devices.constants.each do |c|
+      Devices.constants.sort_by(&:length).reverse_each do |c|
         device = Devices.const_get(c)
         next unless device.resolutions.include?(size)
         # assign to filename_device if the filename contains the formatted name / id and its priority is higher than the current filename_device

data/frameit/lib/frameit/device_types.rb

@@ -47,6 +47,10 @@ module Frameit
     PURPLE ||= "Purple"
     GRAPHITE ||= "Graphite"
     PACIFIC_BLUE ||= "Pacific Blue"
+    MIDNIGHT ||= "Midnight"
+    STARLIGHT ||= "Starlight"
+    SIERRA ||= "Sierra"
+    SORTA_SAGE ||= "Sorta Sage"
 
     def self.all_colors
       Color.constants.map { |c| Color.const_get(c).upcase.gsub(' ', '_') }
@@ -82,6 +86,7 @@ module Frameit
     # Google Pixel 4's priority should be higher than Samsung Galaxy S10+ (priority 8):
     GOOGLE_PIXEL_4 ||= Frameit::Device.new("google-pixel-4", "Google Pixel 4", 9, [[1080, 2280], [2280, 1080]], 444, Color::JUST_BLACK, Platform::ANDROID)
     GOOGLE_PIXEL_4_XL ||= Frameit::Device.new("google-pixel-4-xl", "Google Pixel 4 XL", 9, [[1440, 3040], [3040, 1440]], 537, Color::JUST_BLACK, Platform::ANDROID)
+    GOOGLE_PIXEL_5 ||= Frameit::Device.new("google-pixel-5", "Google Pixel 5", 10, [[1080, 2340], [2340, 1080]], 432, Color::JUST_BLACK, Platform::ANDROID)
     HTC_ONE_A9 ||= Frameit::Device.new("htc-one-a9", "HTC One A9", 6, [[1080, 1920], [1920, 1080]], 441, Color::BLACK, Platform::ANDROID)
     HTC_ONE_M8 ||= Frameit::Device.new("htc-one-m8", "HTC One M8", 3, [[1080, 1920], [1920, 1080]], 441, Color::BLACK, Platform::ANDROID)
     HUAWEI_P8 ||= Frameit::Device.new("huawei-p8", "Huawei P8", 5, [[1080, 1920], [1920, 1080]], 424, Color::BLACK, Platform::ANDROID)
@@ -124,6 +129,10 @@ module Frameit
     IPHONE_12_PRO ||= Frameit::Device.new("iphone-12-pro", "Apple iPhone 12 Pro", 10, [[1170, 2532], [2532, 1170]], 460, Color::SPACE_GRAY, Platform::IOS)
     IPHONE_12_PRO_MAX ||= Frameit::Device.new("iphone12-pro-max", "Apple iPhone 12 Pro Max", 10, [[1284, 2778], [2778, 1284]], 458, Color::GRAPHITE, Platform::IOS)
     IPHONE_12_MINI ||= Frameit::Device.new("iphone-12-mini", "Apple iPhone 12 Mini", 10, [[1125, 2436], [2436, 1125]], 476, Color::BLACK, Platform::IOS)
+    IPHONE_13 ||= Frameit::Device.new("iphone-13", "Apple iPhone 13", 11, [[1170, 2532], [2532, 1170]], 460, Color::MIDNIGHT, Platform::IOS)
+    IPHONE_13_PRO ||= Frameit::Device.new("iphone-13-pro", "Apple iPhone 13 Pro", 11, [[1170, 2532], [2532, 1170]], 460, Color::GRAPHITE, Platform::IOS)
+    IPHONE_13_PRO_MAX ||= Frameit::Device.new("iphone13-pro-max", "Apple iPhone 13 Pro Max", 11, [[1284, 2778], [2778, 1284]], 458, Color::GRAPHITE, Platform::IOS)
+    IPHONE_13_MINI ||= Frameit::Device.new("iphone-13-mini", "Apple iPhone 13 Mini", 11, [[1080, 2340], [2340, 1080]], 476, Color::MIDNIGHT, Platform::IOS)
     IPAD_10_2 ||= Frameit::Device.new("ipad-10-2", "Apple iPad 10.2", 1, [[1620, 2160], [2160, 1620]], 264, Color::SPACE_GRAY, Platform::IOS)
     IPAD_AIR_2 ||= Frameit::Device.new("ipad-air-2", "Apple iPad Air 2", 1, [[1536, 2048], [2048, 1536]], 264, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_IPAD)
     IPAD_AIR_2019 ||= Frameit::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

@@ -467,26 +467,24 @@ module Frameit
         # Get matching trim box:
         trim_box = trim_boxes[key]
 
-        # For side-by-side text images (e.g. stack_title is false) adjust the trim box based on top_vertical_trim_offset and bottom_vertical_trim_offset to maintain the text baseline:
-        unless stack_title
-          # Determine the trim area by maintaining the same vertical top offset based on the smallest value from all trim boxes (top_vertical_trim_offset).
-          # When the vertical top offset is larger than the smallest vertical top offset, the trim box needs to be adjusted:
-          if trim_box.offset_y > top_vertical_trim_offset
-            # Increase the height of the trim box with the difference in vertical top offset:
-            trim_box.height += trim_box.offset_y - top_vertical_trim_offset
-            # Change the vertical top offset to match that of the others:
-            trim_box.offset_y = top_vertical_trim_offset
-
-            UI.verbose("Trim box for key \"#{key}\" is adjusted to align top: #{trim_box}\n")
-          end
+        # Adjust the trim box based on top_vertical_trim_offset and bottom_vertical_trim_offset to maintain the text baseline:
+        # Determine the trim area by maintaining the same vertical top offset based on the smallest value from all trim boxes (top_vertical_trim_offset).
+        # When the vertical top offset is larger than the smallest vertical top offset, the trim box needs to be adjusted:
+        if trim_box.offset_y > top_vertical_trim_offset
+          # Increase the height of the trim box with the difference in vertical top offset:
+          trim_box.height += trim_box.offset_y - top_vertical_trim_offset
+          # Change the vertical top offset to match that of the others:
+          trim_box.offset_y = top_vertical_trim_offset
+
+          UI.verbose("Trim box for key \"#{key}\" is adjusted to align top: #{trim_box.json_string_format}")
+        end
 
-          # Check if the height needs to be adjusted to reach the bottom offset:
-          if (trim_box.offset_y + trim_box.height) < bottom_vertical_trim_offset
-            # Set the height of the trim box to the difference between vertical bottom and top offset:
-            trim_box.height = bottom_vertical_trim_offset - trim_box.offset_y
+        # Check if the height needs to be adjusted to reach the bottom offset:
+        if (trim_box.offset_y + trim_box.height) < bottom_vertical_trim_offset
+          # Set the height of the trim box to the difference between vertical bottom and top offset:
+          trim_box.height = bottom_vertical_trim_offset - trim_box.offset_y
 
-            UI.verbose("Trim box for key \"#{key}\" is adjusted to align bottom: #{trim_box}\n")
-          end
+          UI.verbose("Trim box for key \"#{key}\" is adjusted to align bottom: #{trim_box.json_string_format}")
         end
 
         # Crop image with (adjusted) trim box parameters in MiniMagick string format:

data/frameit/lib/frameit/frame_downloader.rb

@@ -53,7 +53,7 @@ module Frameit
 
     def print_disclaimer
       UI.header("Device frames disclaimer")
-      UI.important("All used device frames are available via Facebook Design: http://facebook.design/devices")
+      UI.important("All used device frames are available via Facebook Design: https://design.facebook.com/toolsandresources/devices/")
       UI.message("----------------------------------------")
       UI.message("While Facebook has redrawn and shares these assets for the benefit")
       UI.message("of the design community, Facebook does not own any of the underlying")

data/frameit/lib/frameit/trim_box.rb

@@ -31,5 +31,11 @@ module Frameit
       # Convert trim box parameters to string with syntax: "<width>x<height>+<offset_x>+<offset_y>":
       return "#{@width}x#{@height}+#{@offset_x}+#{@offset_y}"
     end
+
+    # Get the trimbox parameters in a human readable JSON string format
+    def json_string_format
+      # Create a JSON string from the trim box parameters:
+      return "{\"width\" : #{@width}, \"height\" : #{@height} , \"offset_x\" : #{@offset_x}, \"offset_y\" : #{@offset_y}}"
+    end
   end
 end

data/gym/lib/gym/generators/build_command_generator.rb

@@ -7,7 +7,7 @@ module Gym
     class << self
       def generate
         parts = prefix
-        parts << "xcodebuild"
+        parts << Gym.config[:xcodebuild_command]
         parts += options
         parts += buildactions
         parts += setting
@@ -39,11 +39,12 @@ module Gym
         options << "-destination '#{config[:destination]}'" if config[:destination]
         options << "-archivePath #{archive_path.shellescape}" unless config[:skip_archive]
         options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
+        options << "-showBuildTimingSummary" if config[:build_timing_summary]
         if config[:use_system_scm] && !options.include?("-scmProvider system")
           options << "-scmProvider system"
         end
         options << config[:xcargs] if config[:xcargs]
-        options << "OTHER_SWIFT_FLAGS=\"-Xfrontend -debug-time-function-bodies\"" if config[:analyze_build_time]
+        options << "OTHER_SWIFT_FLAGS=\"\\\$(value) -Xfrontend -debug-time-function-bodies\"" if config[:analyze_build_time]
 
         options
       end
@@ -72,32 +73,78 @@ module Gym
       def pipe
         pipe = []
         pipe << "| tee #{xcodebuild_log_path.shellescape}"
-        unless Gym.config[:disable_xcpretty]
-          formatter = Gym.config[:xcpretty_formatter]
-          pipe << "| xcpretty"
-          pipe << " --test" if Gym.config[:xcpretty_test_format]
-          pipe << " --no-color" if Helper.colors_disabled?
-          pipe << " --formatter " if formatter
-          pipe << formatter if formatter
-          pipe << "--utf" if Gym.config[:xcpretty_utf]
-          report_output_junit = Gym.config[:xcpretty_report_junit]
-          report_output_html = Gym.config[:xcpretty_report_html]
-          report_output_json = Gym.config[:xcpretty_report_json]
-          if report_output_junit
-            pipe << " --report junit --output "
-            pipe << report_output_junit.shellescape
-          elsif report_output_html
-            pipe << " --report html --output "
-            pipe << report_output_html.shellescape
-          elsif report_output_json
-            pipe << " --report json-compilation-database --output "
-            pipe << report_output_json.shellescape
-          end
+
+        formatter = Gym.config[:xcodebuild_formatter].chomp
+        options = legacy_xcpretty_options
+
+        if Gym.config[:disable_xcpretty] || formatter == ''
+          UI.verbose("Not using an xcodebuild formatter")
+        elsif !options.empty?
+          UI.important("Detected legacy xcpretty being used so formatting wth xcpretty")
+          UI.important("Option(s) used: #{options.join(', ')}")
+          pipe += pipe_xcpretty
+        elsif formatter == 'xcpretty'
+          pipe += pipe_xcpretty
+        elsif formatter == 'xcbeautify'
+          pipe += pipe_xcbeautify
+        else
+          pipe << "| #{formatter}"
         end
+
         pipe << "> /dev/null" if Gym.config[:suppress_xcode_output]
         pipe
       end
 
+      def pipe_xcbeautify
+        pipe = ['| xcbeautify']
+
+        if FastlaneCore::Helper.colors_disabled?
+          pipe << '--disable-colored-output'
+        end
+
+        return pipe
+      end
+
+      def legacy_xcpretty_options
+        options = []
+
+        options << "xcpretty_test_format" if Gym.config[:xcpretty_test_format]
+        options << "xcpretty_formatter" if Gym.config[:xcpretty_formatter]
+        options << "xcpretty_report_junit" if Gym.config[:xcpretty_report_junit]
+        options << "xcpretty_report_html" if Gym.config[:xcpretty_report_html]
+        options << "xcpretty_report_json" if Gym.config[:xcpretty_report_json]
+        options << "xcpretty_utf" if Gym.config[:xcpretty_utf]
+
+        return options
+      end
+
+      def pipe_xcpretty
+        pipe = []
+
+        formatter = Gym.config[:xcpretty_formatter]
+        pipe << "| xcpretty"
+        pipe << " --test" if Gym.config[:xcpretty_test_format]
+        pipe << " --no-color" if Helper.colors_disabled?
+        pipe << " --formatter " if formatter
+        pipe << formatter if formatter
+        pipe << "--utf" if Gym.config[:xcpretty_utf]
+        report_output_junit = Gym.config[:xcpretty_report_junit]
+        report_output_html = Gym.config[:xcpretty_report_html]
+        report_output_json = Gym.config[:xcpretty_report_json]
+        if report_output_junit
+          pipe << " --report junit --output "
+          pipe << report_output_junit.shellescape
+        elsif report_output_html
+          pipe << " --report html --output "
+          pipe << report_output_html.shellescape
+        elsif report_output_json
+          pipe << " --report json-compilation-database --output "
+          pipe << report_output_json.shellescape
+        end
+
+        pipe
+      end
+
       def post_build
         commands = []
         commands << %{grep -E '^[0-9.]+ms' #{xcodebuild_log_path.shellescape} | grep -vE '^0\.[0-9]' | sort -nr > culprits.txt} if Gym.config[:analyze_build_time]

data/gym/lib/gym/options.rb

@@ -1,4 +1,5 @@
 require 'fastlane_core/configuration/config_item'
+require 'fastlane/helper/xcodebuild_formatter_helper'
 require 'credentials_manager/appfile_config'
 require_relative 'module'
 
@@ -230,8 +231,25 @@ module Gym
                                      description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
                                      optional: true,
                                      type: Boolean),
+
+        FastlaneCore::ConfigItem.new(key: :xcodebuild_formatter,
+                                     env_names: ["GYM_XCODEBUILD_FORMATTER", "FASTLANE_XCODEBUILD_FORMATTER"],
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter (More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/)",
+                                     type: String,
+                                     default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
+                                     default_value_dynamic: true),
+
+        FastlaneCore::ConfigItem.new(key: :build_timing_summary,
+                                     env_name: "GYM_BUILD_TIMING_SUMMARY",
+                                     description: "Create a build timing summary",
+                                     type: Boolean,
+                                     default_value: false,
+                                     optional: true),
+
+        # xcpretty
         FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
                                      env_name: "DISABLE_XCPRETTY",
+                                     deprecated: "Use `xcodebuild_formatter: ''` instead",
                                      description: "Disable xcpretty formatting of build output",
                                      optional: true,
                                      type: Boolean),
@@ -259,22 +277,29 @@ module Gym
                                      env_name: "XCPRETTY_REPORT_JSON",
                                      description: "Have xcpretty create a JSON compilation database at the provided path",
                                      optional: true),
-        FastlaneCore::ConfigItem.new(key: :analyze_build_time,
-                                     env_name: "GYM_ANALYZE_BUILD_TIME",
-                                     description: "Analyze the project build time and store the output in 'culprits.txt' file",
-                                     optional: true,
-                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :xcpretty_utf,
                                      env_name: "XCPRETTY_UTF",
                                      description: "Have xcpretty use unicode encoding when reporting builds",
                                      optional: true,
                                      type: Boolean),
+
+        FastlaneCore::ConfigItem.new(key: :analyze_build_time,
+                                     env_name: "GYM_ANALYZE_BUILD_TIME",
+                                     description: "Analyze the project build time and store the output in 'culprits.txt' file",
+                                     optional: true,
+                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :skip_profile_detection,
                                      env_name: "GYM_SKIP_PROFILE_DETECTION",
                                      description: "Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used",
                                      optional: true,
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :xcodebuild_command,
+                                     env_name: "GYM_XCODE_BUILD_COMMAND",
+                                     description: "Allows for override of the default `xcodebuild` command",
+                                     type: String,
+                                     optional: true,
+                                     default_value: "xcodebuild"),
         FastlaneCore::ConfigItem.new(key: :cloned_source_packages_path,
                                      env_name: "GYM_CLONED_SOURCE_PACKAGES_PATH",
                                      description: "Sets a custom path for Swift Package Manager dependencies",

data/match/lib/match/change_password.rb

@@ -42,6 +42,8 @@ module Match
       message = "[fastlane] Changed passphrase"
       files_to_commit = encryption.encrypt_files(password: new_password)
       storage.save_changes!(files_to_commit: files_to_commit, custom_message: message)
+    ensure
+      storage.clear_changes if storage
     end
 
     def self.ensure_ui_interactive

data/match/lib/match/commands_generator.rb

@@ -155,7 +155,8 @@ module Match
         FastlaneCore::CommanderGenerator.new.generate(Match::Options.available_options, command: c)
 
         c.action do |args, options|
-          Match::Migrate.new.migrate(args, options)
+          params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+          Match::Migrate.new.migrate(params)
         end
       end
 

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

@@ -135,7 +135,7 @@ module Match
         UI.crash!("Error encrypting '#{path}'")
       end
 
-      # The encryption parameters in this implementations reflect the old behaviour which depended on the users' local OpenSSL version
+      # The encryption parameters in this implementations reflect the old behavior which depended on the users' local OpenSSL version
       # 1.0.x OpenSSL and earlier versions use MD5, 1.1.0c and newer uses SHA256, we try both before giving an error
       def decrypt_specific_file(path: nil, password: nil, hash_algorithm: "MD5")
         stored_data = Base64.decode64(File.read(path))

data/match/lib/match/encryption.rb

@@ -18,6 +18,9 @@ module Match
           "s3" => lambda { |params|
             params[:keychain_name] = params[:s3_bucket]
             return Encryption::OpenSSL.configure(params)
+          },
+          "gitlab_secure_files" => lambda { |params|
+            return nil
           }
         }
       end

data/match/lib/match/generator.rb

@@ -90,6 +90,7 @@ module Match
         template_name: params[:template_name],
         fail_on_name_taken: params[:fail_on_name_taken],
         include_all_certificates: params[:include_all_certificates],
+        include_mac_in_profiles: params[:include_mac_in_profiles],
       }
 
       values[:platform] = params[:platform]

data/match/lib/match/importer.rb

@@ -31,11 +31,14 @@ module Match
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
         google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
         google_cloud_project_id: params[:google_cloud_project_id].to_s,
+        skip_google_cloud_account_confirmation: params[:skip_google_cloud_account_confirmation],
         s3_bucket: params[:s3_bucket],
         s3_region: params[:s3_region],
         s3_access_key: params[:s3_access_key],
         s3_secret_access_key: params[:s3_secret_access_key],
         s3_object_prefix: params[:s3_object_prefix],
+        gitlab_project: params[:gitlab_project],
+        gitlab_host: params[:gitlab_host],
         readonly: params[:readonly],
         username: params[:username],
         team_id: params[:team_id],
@@ -71,12 +74,17 @@ module Match
         ].join(',')
       when :developer_id_application
         certificate_type = [
-          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION,
+          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
         ].join(',')
       when :mac_installer_distribution
         certificate_type = [
           Spaceship::ConnectAPI::Certificate::CertificateType::MAC_INSTALLER_DISTRIBUTION
         ].join(',')
+      when :developer_id_installer
+        certificate_type = [
+          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_INSTALLER
+        ].join(',')
       else
         UI.user_error!("Cert type '#{cert_type}' is not supported")
       end
@@ -141,6 +149,8 @@ module Match
       # Encrypt and commit
       encryption.encrypt_files if encryption
       storage.save_changes!(files_to_commit: files_to_commit)
+    ensure
+      storage.clear_changes if storage
     end
 
     def ensure_valid_file_path(file_path, file_description, file_extension, optional: false)

data/match/lib/match/migrate.rb

@@ -1,4 +1,3 @@
-require_relative 'options'
 require_relative 'spaceship_ensure'
 require_relative 'encryption'
 require_relative 'storage'
@@ -7,8 +6,7 @@ require 'fileutils'
 
 module Match
   class Migrate
-    def migrate(args, options)
-      params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+    def migrate(params)
       loaded_matchfile = params.load_configuration_file("Matchfile")
 
       ensure_parameters_are_valid(params)
@@ -88,6 +86,9 @@ module Match
       UI.success("You can also remove the `git_url`, as well as any other git related configurations from your Fastfile and Matchfile")
       UI.message("")
       UI.input("Please make sure to read the above and confirm with enter")
+    ensure
+      google_cloud_storage.clear_changes if google_cloud_storage
+      git_storage.clear_changes if git_storage
     end
 
     def api_token(params)

data/match/lib/match/module.rb

@@ -1,3 +1,5 @@
+require 'spaceship'
+
 require 'fastlane_core/helper'
 require 'fastlane/boolean'
 
@@ -9,11 +11,11 @@ module Match
   DESCRIPTION = "Easily sync your certificates and profiles across your team"
 
   def self.environments
-    return %w(appstore adhoc development enterprise developer_id mac_installer_distribution)
+    return %w(appstore adhoc development enterprise developer_id mac_installer_distribution developer_id_installer)
   end
 
   def self.storage_modes
-    return %w(git google_cloud s3)
+    return %w(git google_cloud s3 gitlab_secure_files)
   end
 
   def self.profile_type_sym(type)
@@ -30,4 +32,54 @@ module Match
     return :distribution if ["adhoc", "appstore", "distribution"].include?(type)
     raise "Unknown cert type: '#{type}'"
   end
+
+  # Converts provisioning profile type (i.e. development, enterprise) to an array of profile types
+  # That can be used for filtering when using Spaceship::ConnectAPI::Profile API
+  def self.profile_types(prov_type)
+    case prov_type.to_sym
+    when :appstore
+      return [
+        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
+      ]
+    when :development
+      return [
+        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
+      ]
+    when :enterprise
+      profiles = [
+        Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE,
+        Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE
+      ]
+
+      # As of 2022-06-25, only available with Apple ID auth
+      if Spaceship::ConnectAPI.token
+        UI.important("Skipping #{Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_INHOUSE} and #{Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_INHOUSE}... only available with Apple ID auth")
+      else
+        profiles += [
+          Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_INHOUSE,
+          Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_INHOUSE
+        ]
+      end
+
+      return profiles
+    when :adhoc
+      return [
+        Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC,
+        Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC
+      ]
+    when :developer_id
+      return [
+        Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT,
+        Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT
+      ]
+    else
+      raise "Unknown provisioning type '#{prov_type}'"
+    end
+  end
 end