fastlane 2.128.0 → 2.132.0

data/scan/lib/scan/runner.rb

@@ -136,7 +136,7 @@ module Scan
       # Zips build products and moves it to output directory
       UI.message("Zipping build products")
       FastlaneCore::Helper.zip_directory(path, output_path, contents_only: true, overwrite: true, print: false)
-      UI.message("Succesfully zipped build products: #{output_path}")
+      UI.message("Successfully zipped build products: #{output_path}")
     end
 
     def test_results

data/sigh/lib/sigh/download_all.rb

@@ -12,7 +12,42 @@ module Sigh
       Spaceship.select_team
       UI.message("Successfully logged in")
 
-      Spaceship.provisioning_profile.all(xcode: download_xcode_profiles).each do |profile|
+      case Sigh.config[:platform].to_s
+      when 'ios'
+        download_profiles(Spaceship.provisioning_profile.all(xcode: download_xcode_profiles))
+        xcode_profiles_downloaded?(xcode: download_xcode_profiles, supported: true)
+      when 'macos'
+        download_profiles(Spaceship.provisioning_profile.all(mac: true, xcode: download_xcode_profiles))
+        xcode_profiles_downloaded?(xcode: download_xcode_profiles, supported: true)
+      when 'tvos'
+        download_profiles(Spaceship.provisioning_profile.all_tvos)
+        xcode_profiles_downloaded?(xcode: download_xcode_profiles, supported: false)
+      end
+    end
+
+    # @param xcode [Bool] Whether or not the user passed the download_xcode_profiles flag
+    # @param supported [Bool] Whether or not this platform supports downloading xcode profiles at all
+    def xcode_profiles_downloaded?(xcode: false, supported: false)
+      if supported
+        if xcode
+          UI.message("This run also included all Xcode managed provisioning profiles, as you used the `--download_xcode_profiles` flag")
+        elsif !xcode
+          UI.message("All Xcode managed provisioning profiles were ignored on this, to include them use the `--download_xcode_profiles` flag")
+        end
+
+      elsif !supported
+        if xcode
+          UI.important("Downloading Xcode managed profiles is not supported for platform #{Sigh.config[:platform]}")
+          return
+        end
+      end
+    end
+
+    # @param profiles [Array] Array of all the provisioning profiles we want to download
+    def download_profiles(profiles)
+      UI.important("No profiles available for download") if profiles.empty?
+
+      profiles.each do |profile|
         if profile.valid?
           UI.message("Downloading profile '#{profile.name}'...")
           download_profile(profile)
@@ -20,19 +55,24 @@ module Sigh
           UI.important("Skipping invalid/expired profile '#{profile.name}'")
         end
       end
-
-      if download_xcode_profiles
-        UI.message("This run also included all Xcode managed provisioning profiles, as you used the `--download_xcode_profiles` flag")
-      else
-        UI.message("All Xcode managed provisioning profiles were ignored on this, to include them use the `--download_xcode_profiles` flag")
-      end
     end
 
+    # @param profile [ProvisioningProfile] A profile we plan to download and store
     def download_profile(profile)
       FileUtils.mkdir_p(Sigh.config[:output_path])
 
       type_name = profile.class.pretty_type
-      profile_name = "#{type_name}_#{profile.uuid}_#{profile.app.bundle_id}.mobileprovision" # default name
+      profile_name = "#{type_name}_#{profile.uuid}_#{profile.app.bundle_id}"
+
+      if Sigh.config[:platform].to_s == 'tvos'
+        profile_name += "_tvos"
+      end
+
+      if Sigh.config[:platform].to_s == 'macos'
+        profile_name += '.provisionprofile'
+      else
+        profile_name += '.mobileprovision'
+      end
 
       output_path = File.join(Sigh.config[:output_path], profile_name)
       File.open(output_path, "wb") do |f|

data/sigh/lib/sigh/runner.rb

@@ -155,27 +155,35 @@ module Sigh
       case Sigh.config[:platform].to_s
       when 'ios', 'tvos'
         if profile_type == Spaceship.provisioning_profile.Development
-          certificates = Spaceship.certificate.development.all
+          certificates = Spaceship.certificate.development.all +
+                         Spaceship.certificate.apple_development.all
         elsif profile_type == Spaceship.provisioning_profile.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?
+          # Enterprise accounts don't have access to Apple Distribution certificates
           certificates = Spaceship.certificate.in_house.all
         else
-          certificates = Spaceship.certificate.production.all # Ad hoc or App Store
+          # Ad hoc or App Store
+          certificates = Spaceship.certificate.production.all +
+                         Spaceship.certificate.apple_distribution.all
         end
 
       when 'macos'
         if profile_type == Spaceship.provisioning_profile.Development
-          certificates = Spaceship.certificate.mac_development.all
+          certificates = Spaceship.certificate.mac_development.all +
+                         Spaceship.certificate.apple_development.all
         elsif profile_type == Spaceship.provisioning_profile.AppStore
-          certificates = Spaceship.certificate.mac_app_distribution.all
+          certificates = Spaceship.certificate.mac_app_distribution.all +
+                         Spaceship.certificate.apple_distribution.all
         elsif profile_type == Spaceship.provisioning_profile.Direct
           certificates = Spaceship.certificate.developer_id_application.all
         else
-          certificates = Spaceship.certificate.mac_app_distribution.all
+          certificates = Spaceship.certificate.mac_app_distribution.all +
+                         Spaceship.certificate.apple_distribution.all
         end
       end
 

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -175,11 +175,11 @@ open class Snapshot: NSObject {
 
             let screenshot = XCUIScreen.main.screenshot()
             guard var simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
-            
+
             do {
                 // The simulator name contains "Clone X of " inside the screenshot file when running parallelized UI Tests on concurrent devices
                 let regex = try NSRegularExpression(pattern: "Clone [0-9]+ of ")
-                let range = NSMakeRange(0, simulator.count)
+                let range = NSRange(location: 0, length: simulator.count)
                 simulator = regex.stringByReplacingMatches(in: simulator, range: range, withTemplate: "")
 
                 let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
@@ -300,4 +300,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.20]
+// SnapshotHelperVersion [1.21]

data/snapshot/lib/snapshot/commands_generator.rb

@@ -56,10 +56,10 @@ module Snapshot
       command :update do |c|
         c.syntax = 'fastlane snapshot update'
         c.description = "Updates your SnapshotHelper.swift to the latest version"
-
+        c.option('--force', 'Disables confirmation prompts')
         c.action do |args, options|
           require 'snapshot/update'
-          Snapshot::Update.new.update
+          Snapshot::Update.new.update(force: options.force)
         end
       end
 

data/snapshot/lib/snapshot/options.rb

@@ -116,6 +116,11 @@ module Snapshot
                                      description: "Enabling this option will configure the Simulator's system language",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :dark_mode,
+                                    env_name: 'SNAPSHOT_DARK_MODE',
+                                    description: "Enabling this option will configure the Simulator to be in dark mode (false for light, true for dark)",
+                                    optional: true,
+                                    type: Boolean),
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      env_name: 'SNAPSHOT_APP_IDENTIFIER',
                                      short_option: "-a",

data/snapshot/lib/snapshot/reports_generator.rb

@@ -77,6 +77,9 @@ module Snapshot
       {
         # snapshot in Xcode 9 saves screenshots with the SIMULATOR_DEVICE_NAME
         # which includes spaces
+        'iPhone 11 Pro Max' => "iPhone 11 Pro Max",
+        'iPhone 11 Pro' => "iPhone 11 Pro",
+        'iPhone 11' => "iPhone 11",
         'iPhone XS Max' => "iPhone XS Max",
         'iPhone XS' => "iPhone XS",
         'iPhone XR' => "iPhone XR",

data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb

@@ -8,6 +8,7 @@ module Snapshot
     attr_accessor :clean
     attr_accessor :erase_simulator
     attr_accessor :localize_simulator
+    attr_accessor :dark_mode
     attr_accessor :reinstall_app
     attr_accessor :app_identifier
 
@@ -32,6 +33,7 @@ module Snapshot
       @clean = snapshot_config[:clean]
       @erase_simulator = snapshot_config[:erase_simulator]
       @localize_simulator = snapshot_config[:localize_simulator]
+      @dark_mode = snapshot_config[:dark_mode]
       @reinstall_app = snapshot_config[:reinstall_app]
       @app_identifier = snapshot_config[:app_identifier]
       @number_of_retries = snapshot_config[:number_of_retries]

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb

@@ -190,7 +190,7 @@ module Snapshot
           hash[name] = ["No tests were executed"]
         else
           tests = Array(summary.data.first[:tests])
-          hash[name] = tests.map { |test| Array(test[:failures]).map { |failure| failure[:failure_message] } }.flatten
+          hash[name] = tests.flat_map { |test| Array(test[:failures]).map { |failure| failure[:failure_message] } }
         end
       end
     end

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -55,11 +55,14 @@ module Snapshot
       Fixes::HardwareKeyboardFix.patch
 
       device_types.each do |type|
-        if launcher_config.erase_simulator || launcher_config.localize_simulator
+        if launcher_config.erase_simulator || launcher_config.localize_simulator || !launcher_config.dark_mode.nil?
           erase_simulator(type)
           if launcher_config.localize_simulator
             localize_simulator(type, language, locale)
           end
+          unless launcher_config.dark_mode.nil?
+            interface_style(type, launcher_config.dark_mode)
+          end
         elsif launcher_config.reinstall_app
           # no need to reinstall if device has been erased
           uninstall_app(type)
@@ -124,6 +127,18 @@ module Snapshot
       end
     end
 
+    def interface_style(device_type, dark_mode)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+      if device_udid
+        plist = {
+          UserInterfaceStyleMode: (dark_mode ? 2 : 1)
+        }
+        UI.message("Setting interface style #{device_type} (UserInterfaceStyleMode=#{dark_mode})")
+        plist_path = "#{ENV['HOME']}/Library/Developer/CoreSimulator/Devices/#{device_udid}/data/Library/Preferences/com.apple.uikitservices.userInterfaceStyleMode.plist"
+        File.write(plist_path, Plist::Emit.dump(plist))
+      end
+    end
+
     def copy_simulator_logs(device_names, language, locale, launch_arguments)
       return unless launcher_config.output_simulator_logs
 

data/snapshot/lib/snapshot/update.rb

@@ -11,7 +11,7 @@ module Snapshot
       paths.reject { |p| p.include?("snapshot/lib/assets/") }
     end
 
-    def update
+    def update(force: false)
       paths = self.class.find_helper
       UI.user_error!("Couldn't find any SnapshotHelper files in current directory") if paths.count == 0
 
@@ -22,7 +22,9 @@ module Snapshot
       UI.message("The underlying API will not change. You can always migrate manually by looking at")
       UI.message("https://github.com/fastlane/fastlane/blob/master/snapshot/lib/assets/SnapshotHelper.swift")
 
-      return 1 unless UI.confirm("Overwrite configuration files?")
+      if !force && !UI.confirm("Overwrite configuration files?")
+        return 1
+      end
 
       paths.each do |path|
         UI.message("Updating '#{path}'...")

data/spaceship/lib/spaceship/client.rb

@@ -738,7 +738,7 @@ module Spaceship
         raise InternalServerError, "Received an internal server error from App Store Connect / Developer Portal, please try again later"
       elsif body.to_s.include?("Gateway Timeout - In read")
         raise GatewayTimeoutError, "Received a gateway timeout error from App Store Connect / Developer Portal, please try again later"
-      elsif (body["resultString"] || "").include?("Program License Agreement")
+      elsif (body["userString"] || "").include?("Program License Agreement")
         raise ProgramLicenseAgreementUpdated, "#{body['userString']} Please manually log into your Apple Developer account to review and accept the updated agreement."
       end
     end

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

@@ -32,7 +32,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_apps(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def self.find(bundle_id)
@@ -54,7 +54,7 @@ module Spaceship
         filter[:apps] = id
 
         resps = Spaceship::ConnectAPI.get_beta_testers(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       #
@@ -66,7 +66,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_builds(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -74,7 +74,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_build_deliveries(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_beta_app_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -82,7 +82,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_beta_app_localizations(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_beta_groups(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -90,7 +90,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_beta_groups(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

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

@@ -24,6 +24,7 @@ module Spaceship
 
       module BetaTesterState
         INSTALLED = "INSTALLED"
+        INVITED = "INVITED"
         NO_BUILDS = "NO_BUILDS"
       end
 

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

@@ -109,7 +109,7 @@ module Spaceship
           sort: sort,
           limit: limit
         ).all_pages
-        models = resps.map(&:to_models).flatten
+        models = resps.flat_map(&:to_models)
 
         # Filtering after models are fetched since there is no way to do this in a query param filter
         if platform
@@ -138,7 +138,7 @@ module Spaceship
           sort: sort,
           limit: limit
         ).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_build_beta_details(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -148,7 +148,7 @@ module Spaceship
           sort: sort,
           limit: limit
         ).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def post_beta_app_review_submission

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

@@ -29,7 +29,7 @@ module Spaceship
           filter: { app: app_id, cfBundleShortVersionString: version, cfBundleVersion: build_number },
           limit: 1
         ).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

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

@@ -35,7 +35,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_bundle_ids(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def self.get(bundle_id_id: nil, includes: nil)

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

@@ -41,7 +41,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_certificates(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

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

@@ -46,7 +46,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_devices(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

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

@@ -53,7 +53,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_profiles(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

data/spaceship/lib/spaceship/du/du_client.rb

@@ -22,6 +22,10 @@ module Spaceship
       upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: screenshot_picture_type(device, is_messages))
     end
 
+    def upload_purchase_merch_screenshot(app_id, upload_file, content_provider_id, sso_token_for_image)
+      upload_file(app_id: app_id, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: 'MZPFT.MerchandisingIAPIcon')
+    end
+
     def upload_purchase_review_screenshot(app_id, upload_file, content_provider_id, sso_token_for_image)
       upload_file(app_id: app_id, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: get_picture_type(upload_file))
     end

data/spaceship/lib/spaceship/portal/certificate.rb

@@ -89,6 +89,12 @@ module Spaceship
       # Certs are not associated with apps
       #####################################################
 
+      # An Apple development code signing certificate used for development environment
+      class AppleDevelopment < Certificate; end
+
+      # An Apple distribution code signing certificate used for distribution environment
+      class AppleDistribution < Certificate; end
+
       # A development code signing certificate used for development environment
       class Development < Certificate; end
 
@@ -152,6 +158,11 @@ module Spaceship
       # A Mac push notification certificate for production environment
       class MacProductionPush < PushCertificate; end
 
+      APPLE_CERTIFICATE_TYPE_IDS = {
+        "83Q87W3TGH" => AppleDevelopment,
+        "WXV89964HE" => AppleDistribution
+      }
+
       IOS_CERTIFICATE_TYPE_IDS = {
         "5QPB9NHCEI" => Development,
         "R58UK2EWSO" => Production,
@@ -187,7 +198,9 @@ module Spaceship
         "DIVN2GW3XT" => DeveloperIdApplication
       }
 
-      CERTIFICATE_TYPE_IDS = IOS_CERTIFICATE_TYPE_IDS.merge(MAC_CERTIFICATE_TYPE_IDS)
+      CERTIFICATE_TYPE_IDS = APPLE_CERTIFICATE_TYPE_IDS
+                             .merge(IOS_CERTIFICATE_TYPE_IDS)
+                             .merge(MAC_CERTIFICATE_TYPE_IDS)
 
       # Class methods
       class << self
@@ -259,6 +272,7 @@ module Spaceship
         def all(mac: false)
           if self == Certificate # are we the base-class?
             type_ids = mac ? MAC_CERTIFICATE_TYPE_IDS : IOS_CERTIFICATE_TYPE_IDS
+            type_ids = APPLE_CERTIFICATE_TYPE_IDS.merge(type_ids)
             types = type_ids.keys
             types += OLDER_IOS_CERTIFICATE_TYPES unless mac
           else