fastlane 2.164.0 → 2.169.0

data/fastlane/swift/Gymfile.swift

@@ -17,4 +17,4 @@ public class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.164.0
+// Generated with fastlane 2.169.0

data/fastlane/swift/GymfileProtocol.swift

@@ -133,6 +133,9 @@ public protocol GymfileProtocol: class {
 
     /// Sets a custom path for Swift Package Manager dependencies
     var clonedSourcePackagesPath: String? { get }
+
+    /// Lets xcodebuild use system's scm configuration
+    var useSystemScm: Bool { get }
 }
 
 public extension GymfileProtocol {
@@ -180,8 +183,9 @@ public extension GymfileProtocol {
     var xcprettyUtf: Bool? { return nil }
     var skipProfileDetection: Bool { return false }
     var clonedSourcePackagesPath: String? { return nil }
+    var useSystemScm: Bool { return false }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.50]
+// FastlaneRunnerAPIVersion [0.9.55]

data/fastlane/swift/LaneFileProtocol.swift

@@ -22,8 +22,8 @@ public protocol LaneFileProtocol: class {
 
 public extension LaneFileProtocol {
     var fastlaneVersion: String { return "" } // Defaults to "" because that means any is fine
-    func beforeAll(with lane: String) {} // No-op by default
-    func afterAll(with lane: String) {} // No-op by default
+    func beforeAll(with _: String) {} // No-op by default
+    func afterAll(with _: String) {} // No-op by default
     func onError(currentLane _: String, errorInfo _: String) {} // No-op by default
     func recordLaneDescriptions() {} // No-op by default
 }

data/fastlane/swift/MainProcess.swift

@@ -56,6 +56,8 @@ class MainProcess {
                 print(stdout)
                 self.timeBetweenPrints = Int(self.lastPrintDate.timeIntervalSinceNow)
             }
+
+            // swiftformat:disable:next redundantSelf
             _ = Runner.waitWithPolling(self.timeBetweenPrints, toEventually: { $0 > 5 }, timeout: 10)
             thread.start()
         #endif

data/fastlane/swift/Matchfile.swift

@@ -17,4 +17,4 @@ public class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.164.0
+// Generated with fastlane 2.169.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -2,7 +2,7 @@
 // Copyright (c) 2020 FastlaneTools
 
 public protocol MatchfileProtocol: class {
-    /// Define the profile type, can be appstore, adhoc, development, enterprise, developer_id
+    /// Define the profile type, can be appstore, adhoc, development, enterprise, developer_id, mac_installer_distribution
     var type: String { get }
 
     /// Create additional cert types needed for macOS installers (valid values: mac_installer_distribution, developer_id_installer)
@@ -17,7 +17,7 @@ public protocol MatchfileProtocol: class {
     /// Skip syncing provisioning profiles
     var skipProvisioningProfiles: Bool { get }
 
-    /// The bundle identifier(s) of your app (comma-separated)
+    /// The bundle identifier(s) of your app (comma-separated string or array of strings)
     var appIdentifier: [String] { get }
 
     /// Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)
@@ -92,7 +92,7 @@ public protocol MatchfileProtocol: class {
     /// Keychain the items should be imported to
     var keychainName: String { get }
 
-    /// This might be required the first time you access certificates on a new mac. For the login/default keychain this is your account password
+    /// This might be required the first time you access certificates on a new mac. For the login/default keychain this is your macOS account password
     var keychainPassword: String? { get }
 
     /// Renew the provisioning profiles every time you run match
@@ -184,4 +184,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.44]
+// FastlaneRunnerAPIVersion [0.9.49]

data/fastlane/swift/Precheckfile.swift

@@ -17,4 +17,4 @@ public class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.164.0
+// Generated with fastlane 2.169.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -48,4 +48,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.43]
+// FastlaneRunnerAPIVersion [0.9.48]

data/fastlane/swift/Runner.swift

@@ -37,7 +37,7 @@ class Runner {
         socketClient.send(rubyCommand: command)
 
         let secondsToWait = DispatchTimeInterval.seconds(SocketClient.defaultCommandTimeoutSeconds)
-        // swiftlint:disable next
+        // swiftformat:disable:next redundantSelf
         let timeoutResult = Self.waitWithPolling(self.executeNext[command.id], toEventually: { $0 == true }, timeout: SocketClient.defaultCommandTimeoutSeconds)
         executeNext.removeValue(forKey: command.id)
         let failureMessage = "command didn't execute in: \(SocketClient.defaultCommandTimeoutSeconds) seconds"

data/fastlane/swift/Scanfile.swift

@@ -17,4 +17,4 @@ public class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.164.0
+// Generated with fastlane 2.169.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -179,6 +179,9 @@ public protocol ScanfileProtocol: class {
     /// Use only if you're a pro, use the other options instead
     var destination: String? { get }
 
+    /// Platform to build when using a Catalyst enabled app. Valid values are: ios, macos
+    var catalystPlatform: String? { get }
+
     /// **DEPRECATED!** Use `--output_files` instead - Sets custom full report file name when generating a single report
     var customReportFileName: String? { get }
 
@@ -188,6 +191,9 @@ public protocol ScanfileProtocol: class {
     /// Sets a custom path for Swift Package Manager dependencies
     var clonedSourcePackagesPath: String? { get }
 
+    /// Lets xcodebuild use system's scm configuration
+    var useSystemScm: Bool { get }
+
     /// Should this step stop the build if the tests fail? Set this to false if you're using trainer
     var failBuild: Bool { get }
 }
@@ -252,12 +258,14 @@ public extension ScanfileProtocol {
     var skipSlack: Bool { return false }
     var slackOnlyOnFailure: Bool { return false }
     var destination: String? { return nil }
+    var catalystPlatform: String? { return nil }
     var customReportFileName: String? { return nil }
     var xcodebuildCommand: String { return "env NSUnbufferedIO=YES xcodebuild" }
     var clonedSourcePackagesPath: String? { return nil }
+    var useSystemScm: Bool { return false }
     var failBuild: Bool { return true }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.55]
+// FastlaneRunnerAPIVersion [0.9.60]

data/fastlane/swift/Screengrabfile.swift

@@ -17,4 +17,4 @@ public class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.164.0
+// Generated with fastlane 2.169.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -96,4 +96,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.45]
+// FastlaneRunnerAPIVersion [0.9.50]

data/fastlane/swift/Snapshotfile.swift

@@ -17,4 +17,4 @@ public class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.164.0
+// Generated with fastlane 2.169.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -184,4 +184,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.39]
+// FastlaneRunnerAPIVersion [0.9.44]

data/fastlane/swift/SocketClient.swift

@@ -29,7 +29,7 @@ class SocketClient: NSObject {
     }
 
     static let connectTimeoutSeconds = 2
-    static let defaultCommandTimeoutSeconds = 10_800 // 3 hours
+    static let defaultCommandTimeoutSeconds = 10800 // 3 hours
     static let doneToken = "done" // TODO: remove these
     static let cancelToken = "cancelFastlaneRun"
 

data/fastlane_core/lib/fastlane_core/cert_checker.rb

@@ -22,7 +22,7 @@ module FastlaneCore
     end
 
     def self.installed_identies(in_keychain: nil)
-      install_wwdr_certificate unless wwdr_certificate_installed?
+      install_wwdr_certificates unless wwdr_certificates_installed?
 
       available = list_available_identities(in_keychain: in_keychain)
       # Match for this text against word boundaries to avoid edge cases around multiples of 10 identities!
@@ -81,16 +81,21 @@ module FastlaneCore
       `#{commands.join(' ')}`
     end
 
-    def self.wwdr_certificate_installed?
+    def self.wwdr_certificates_installed?
       certificate_name = "Apple Worldwide Developer Relations Certification Authority"
       keychain = wwdr_keychain
-      response = Helper.backticks("security find-certificate -c '#{certificate_name}' #{keychain.shellescape}", print: FastlaneCore::Globals.verbose?)
-      return response.include?("attributes:")
+      response = Helper.backticks("security find-certificate -a -c '#{certificate_name}' #{keychain.shellescape}", print: FastlaneCore::Globals.verbose?)
+      certs = response.split("keychain: \"#{keychain}\"").drop(1)
+      certs.count == 2
     end
 
-    def self.install_wwdr_certificate
-      url = 'https://developer.apple.com/certificationauthority/AppleWWDRCA.cer'
-      file = Tempfile.new('AppleWWDRCA')
+    def self.install_wwdr_certificates
+      install_wwdr_certificate('https://developer.apple.com/certificationauthority/AppleWWDRCA.cer')
+      install_wwdr_certificate('https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer')
+    end
+
+    def self.install_wwdr_certificate(url)
+      file = Tempfile.new(File.basename(url))
       filename = file.path
       keychain = wwdr_keychain
       keychain = "-k #{keychain.shellescape}" unless keychain.empty?

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -107,7 +107,7 @@ module FastlaneCore
 
     # Do we want to disable the colored output?
     def self.colors_disabled?
-      FastlaneCore::Env.truthy?("FASTLANE_DISABLE_COLORS")
+      FastlaneCore::Env.truthy?("FASTLANE_DISABLE_COLORS") || ENV.key?("NO_COLOR")
     end
 
     # Does the user use the Mac stock terminal
@@ -203,9 +203,17 @@ module FastlaneCore
       return File.join(self.itms_path, 'iTMSTransporter')
     end
 
+    def self.user_defined_itms_path?
+      return FastlaneCore::Env.truthy?("FASTLANE_ITUNES_TRANSPORTER_PATH")
+    end
+
+    def self.user_defined_itms_path
+      return ENV["FASTLANE_ITUNES_TRANSPORTER_PATH"] if self.user_defined_itms_path?
+    end
+
     # @return the full path to the iTMSTransporter executable
     def self.itms_path
-      return ENV["FASTLANE_ITUNES_TRANSPORTER_PATH"] if FastlaneCore::Env.truthy?("FASTLANE_ITUNES_TRANSPORTER_PATH")
+      return self.user_defined_itms_path if FastlaneCore::Env.truthy?("FASTLANE_ITUNES_TRANSPORTER_PATH")
 
       if self.mac?
         # First check for manually install iTMSTransporter

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -254,7 +254,7 @@ module FastlaneCore
   class JavaTransporterExecutor < TransporterExecutor
     def build_upload_command(username, password, source = "/tmp", provider_short_name = "", jwt = nil)
       use_jwt = !jwt.to_s.empty?
-      if Helper.mac? && Helper.xcode_at_least?(11)
+      if !Helper.user_defined_itms_path? && Helper.mac? && Helper.xcode_at_least?(11)
         [
           ("ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}" unless use_jwt),
           'xcrun iTMSTransporter',
@@ -294,7 +294,7 @@ module FastlaneCore
 
     def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "", jwt = nil)
       use_jwt = !jwt.to_s.empty?
-      if Helper.mac? && Helper.xcode_at_least?(11)
+      if !Helper.user_defined_itms_path? && Helper.mac? && Helper.xcode_at_least?(11)
         [
           ("ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}" unless use_jwt),
           'xcrun iTMSTransporter',
@@ -332,7 +332,7 @@ module FastlaneCore
 
     def build_provider_ids_command(username, password, jwt = nil)
       use_jwt = !jwt.to_s.empty?
-      if Helper.mac? && Helper.xcode_at_least?(11)
+      if !Helper.user_defined_itms_path? && Helper.mac? && Helper.xcode_at_least?(11)
         [
           ("ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}" unless use_jwt),
           'xcrun iTMSTransporter',

data/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -47,7 +47,9 @@ module FastlaneCore
       def bundle_id(path, keychain_path = nil)
         profile = parse(path, keychain_path)
         app_id_prefix = profile["ApplicationIdentifierPrefix"].first
-        bundle_id = profile["Entitlements"]["application-identifier"].gsub("#{app_id_prefix}.", "")
+        entitlements = profile["Entitlements"]
+        app_identifier = entitlements["application-identifier"] || entitlements["com.apple.application-identifier"]
+        bundle_id = app_identifier.gsub("#{app_id_prefix}.", "")
         bundle_id
       rescue
         UI.error("Unable to extract the Bundle Id from the provided provisioning profile '#{path}'.")

data/fastlane_core/lib/fastlane_core/ui/disable_colors.rb

@@ -15,3 +15,11 @@ class String
     end
   end
 end
+
+# If a plugin uses the colorize gem, we also want to disable that
+begin
+  require 'colorize'
+  String.disable_colorization = true
+rescue LoadError
+  # Colorize gem is not used by any plugin
+end

data/gym/lib/gym/code_signing_mapping.rb

@@ -142,7 +142,7 @@ module Gym
               next unless specified_configuration == build_configuration.name
 
               # Catalyst apps will have some build settings that will have a configuration
-              # that is specfic for macos so going to do our best to capture those
+              # that is specific for macos so going to do our best to capture those
               #
               # There are other platform filters besides "[sdk=macosx*]" that we could use but
               # this is the default that Xcode will use so this will also be our default

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

@@ -39,6 +39,7 @@ 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 << "-scmProvider system" if config[:use_system_scm]
         options << config[:xcargs] if config[:xcargs]
         options << "OTHER_SWIFT_FLAGS=\"-Xfrontend -debug-time-function-bodies\"" if config[:analyze_build_time]
 

data/gym/lib/gym/options.rb

@@ -279,7 +279,13 @@ module Gym
                                      env_name: "GYM_CLONED_SOURCE_PACKAGES_PATH",
                                      description: "Sets a custom path for Swift Package Manager dependencies",
                                      type: String,
-                                     optional: true)
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :use_system_scm,
+                                     env_name: "GYM_USE_SYSTEM_SCM",
+                                     description: "Lets xcodebuild use system's scm configuration",
+                                     optional: true,
+                                     type: Boolean,
+                                     default_value: false)
       ]
     end
   end

data/match/lib/match/module.rb

@@ -9,7 +9,7 @@ module Match
   DESCRIPTION = "Easily sync your certificates and profiles across your team"
 
   def self.environments
-    return %w(appstore adhoc development enterprise developer_id)
+    return %w(appstore adhoc development enterprise developer_id mac_installer_distribution)
   end
 
   def self.storage_modes

data/match/lib/match/nuke.rb

@@ -252,11 +252,15 @@ module Match
 
       self.encryption.encrypt_files if self.encryption
 
-      # Now we need to commit and push all this too
-      message = ["[fastlane]", "Nuked", "files", "for", type.to_s].join(" ")
-      self.storage.save_changes!(files_to_commit: [],
-                                 files_to_delete: files_to_delete,
-                                 custom_message: message)
+      if files_to_delete.count > 0
+        # Now we need to save all this to the storage too, if needed
+        message = ["[fastlane]", "Nuked", "files", "for", type.to_s].join(" ")
+        self.storage.save_changes!(files_to_commit: [],
+                                   files_to_delete: files_to_delete,
+                                   custom_message: message)
+      else
+        UI.message("Your storage had no files to be deleted. This happens when you run `nuke` with an empty storage. Nothing to be worried about!")
+      end
     end
 
     private

data/match/lib/match/options.rb

@@ -65,7 +65,7 @@ module Match
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      short_option: "-a",
                                      env_name: "MATCH_APP_IDENTIFIER",
-                                     description: "The bundle identifier(s) of your app (comma-separated)",
+                                     description: "The bundle identifier(s) of your app (comma-separated string or array of strings)",
                                      type: Array, # we actually allow String and Array here
                                      skip_type_validation: true,
                                      code_gen_sensitive: true,
@@ -227,7 +227,7 @@ module Match
                                      short_option: "-p",
                                      env_name: "MATCH_KEYCHAIN_PASSWORD",
                                      sensitive: true,
-                                     description: "This might be required the first time you access certificates on a new mac. For the login/default keychain this is your account password",
+                                     description: "This might be required the first time you access certificates on a new mac. For the login/default keychain this is your macOS account password",
                                      optional: true),
 
         # settings

data/pilot/lib/pilot/build_manager.rb

@@ -192,7 +192,7 @@ module Pilot
         [
           build.app_version,
           build.version,
-          (build.beta_build_metrics || []).map(&:install_count).reduce(:+)
+          (build.beta_build_metrics || []).map(&:install_count).compact.reduce(:+)
         ]
       end
 
@@ -273,9 +273,15 @@ module Pilot
       changelog
     end
 
+    def self.emoji_regex
+      # EmojiRegex::RGIEmoji is now preferred over EmojiRegex::Regex which is deprecated as of 3.2.0
+      # https://github.com/ticky/ruby-emoji-regex/releases/tag/v3.2.0
+      return defined?(EmojiRegex::RGIEmoji) ? EmojiRegex::RGIEmoji : EmojiRegex::Regex
+    end
+
     def self.strip_emoji(changelog)
-      if changelog && changelog =~ EmojiRegex::Regex
-        changelog.gsub!(EmojiRegex::Regex, "")
+      if changelog && changelog =~ emoji_regex
+        changelog.gsub!(emoji_regex, "")
         UI.important("Emoji symbols have been removed from the changelog, since they're not allowed by Apple.")
       end
       changelog

data/scan/lib/scan/detect_values.rb

@@ -209,7 +209,9 @@ module Scan
       end
 
       # building up the destination now
-      if Scan.devices && Scan.devices.count > 0
+      if Scan.building_mac_catalyst_for_mac?
+        Scan.config[:destination] = ["platform=macOS,variant=Mac Catalyst"]
+      elsif Scan.devices && Scan.devices.count > 0
         Scan.config[:destination] = Scan.devices.map { |d| "platform=#{d.os_type} Simulator,id=#{d.udid}" }
       elsif Scan.project.mac_app?
         Scan.config[:destination] = min_xcode8? ? ["platform=macOS"] : ["platform=OS X"]

data/scan/lib/scan/module.rb

@@ -21,6 +21,10 @@ module Scan
     def scanfile_name
       "Scanfile"
     end
+
+    def building_mac_catalyst_for_mac?
+      Scan.project.supports_mac_catalyst? && Scan.config[:catalyst_platform] == "macos"
+    end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore