fastlane 2.162.0 → 2.167.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.162.0
+// Generated with fastlane 2.167.0

data/fastlane/swift/GymfileProtocol.swift

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

data/fastlane/swift/LaneFileProtocol.swift

@@ -12,18 +12,18 @@ import Foundation
 
 public protocol LaneFileProtocol: class {
     var fastlaneVersion: String { get }
-    static func runLane(from fastfile: LaneFile?, named: String, parameters: [String: String]) -> Bool
+    static func runLane(from fastfile: LaneFile?, named lane: String, with parameters: [String: String]) -> Bool
 
     func recordLaneDescriptions()
-    func beforeAll()
-    func afterAll(currentLane: String)
+    func beforeAll(with lane: String)
+    func afterAll(with lane: String)
     func onError(currentLane: String, errorInfo: String)
 }
 
 public extension LaneFileProtocol {
     var fastlaneVersion: String { return "" } // Defaults to "" because that means any is fine
-    func beforeAll() {} // No-op by default
-    func afterAll(currentLane _: 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
 }
@@ -32,11 +32,6 @@ public extension LaneFileProtocol {
 open class LaneFile: NSObject, LaneFileProtocol {
     private(set) static var fastfileInstance: LaneFile?
 
-    // Called before any lane is executed.
-    private func setUpAllTheThings() {
-        LaneFile.fastfileInstance!.beforeAll()
-    }
-
     private static func trimLaneFromName(laneName: String) -> String {
         return String(laneName.prefix(laneName.count - 4))
     }
@@ -95,12 +90,12 @@ open class LaneFile: NSObject, LaneFileProtocol {
         }
     }
 
-    public static func runLane(from fastfile: LaneFile?, named: String, parameters: [String: String]) -> Bool {
-        log(message: "Running lane: \(named)")
+    public static func runLane(from fastfile: LaneFile?, named lane: String, with parameters: [String: String]) -> Bool {
+        log(message: "Running lane: \(lane)")
         #if !SWIFT_PACKAGE
             // When not in SPM environment, we load the Fastfile from its `className()`.
             loadFastfile()
-            guard let fastfileInstance: LaneFile = self.fastfileInstance else {
+            guard let fastfileInstance = self.fastfileInstance as? Fastfile else {
                 let message = "Unable to instantiate class named: \(className())"
                 log(message: message)
                 fatalError(message)
@@ -109,14 +104,14 @@ open class LaneFile: NSObject, LaneFileProtocol {
             // When in SPM environment, we can't load the Fastfile from its `className()` because the executable is in
             // another scope, so `className()` won't be the expected Fastfile. Instead, we load the Fastfile as a Lanefile
             // in a static way, by parameter.
-            guard let fastfileInstance: LaneFile = fastfile else {
+            guard let fastfileInstance = fastfile else {
                 log(message: "Found nil instance of fastfile")
                 preconditionFailure()
             }
             self.fastfileInstance = fastfileInstance
         #endif
         let currentLanes = lanes
-        let lowerCasedLaneRequested = named.lowercased()
+        let lowerCasedLaneRequested = lane.lowercased()
 
         guard let laneMethod = currentLanes[lowerCasedLaneRequested] else {
             let laneNames = laneFunctionNames.map { laneFuctionName in
@@ -127,7 +122,7 @@ open class LaneFile: NSObject, LaneFileProtocol {
                 }
             }.joined(separator: ", ")
 
-            let message = "[!] Could not find lane '\(named)'. Available lanes: \(laneNames)"
+            let message = "[!] Could not find lane '\(lane)'. Available lanes: \(laneNames)"
             log(message: message)
 
             let shutdownCommand = ControlCommand(commandType: .cancel(cancelReason: .clientError), message: message)
@@ -136,14 +131,15 @@ open class LaneFile: NSObject, LaneFileProtocol {
         }
 
         // Call all methods that need to be called before we start calling lanes.
-        fastfileInstance.setUpAllTheThings()
+        fastfileInstance.beforeAll(with: lane)
 
         // We need to catch all possible errors here and display a nice message.
         _ = fastfileInstance.perform(NSSelectorFromString(laneMethod), with: parameters)
 
         // Call only on success.
-        fastfileInstance.afterAll(currentLane: named)
-        log(message: "Done running lane: \(named) 🚀")
+        fastfileInstance.afterAll(with: lane)
+
+        log(message: "Done running lane: \(lane) 🚀")
         return true
     }
 }

data/fastlane/swift/MainProcess.swift

@@ -28,7 +28,7 @@ class MainProcess {
     @objc func connectToFastlaneAndRunLane(_ fastfile: LaneFile?) {
         runner.startSocketThread(port: argumentProcessor.port)
 
-        let completedRun = Fastfile.runLane(from: fastfile, named: argumentProcessor.currentLane, parameters: argumentProcessor.laneParameters())
+        let completedRun = Fastfile.runLane(from: fastfile, named: argumentProcessor.currentLane, with: argumentProcessor.laneParameters())
         if completedRun {
             runner.disconnectFromFastlaneProcess()
         }
@@ -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.162.0
+// Generated with fastlane 2.167.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -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)
@@ -122,6 +122,9 @@ public protocol MatchfileProtocol: class {
     /// Should the command fail if it was about to create a duplicate of an existing provisioning profile. It can happen due to issues on Apple Developer Portal, when profile to be recreated was not properly deleted first
     var failOnNameTaken: Bool { get }
 
+    /// Set to true if there is no access to Apple developer portal but there are certificates, keys and profiles provided. Only works with match import action
+    var skipCertificateMatching: Bool { get }
+
     /// Path in which to export certificates, key and profile
     var outputPath: String? { get }
 
@@ -173,6 +176,7 @@ public extension MatchfileProtocol {
     var templateName: String? { return nil }
     var profileName: String? { return nil }
     var failOnNameTaken: Bool { return false }
+    var skipCertificateMatching: Bool { return false }
     var outputPath: String? { return nil }
     var skipSetPartitionList: Bool { return false }
     var verbose: Bool { return false }
@@ -180,4 +184,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.42]
+// FastlaneRunnerAPIVersion [0.9.47]

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.162.0
+// Generated with fastlane 2.167.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.41]
+// FastlaneRunnerAPIVersion [0.9.46]

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.162.0
+// Generated with fastlane 2.167.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 }
 
@@ -252,6 +255,7 @@ 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 }
@@ -260,4 +264,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.53]
+// FastlaneRunnerAPIVersion [0.9.58]

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.162.0
+// Generated with fastlane 2.167.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.43]
+// FastlaneRunnerAPIVersion [0.9.48]

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.162.0
+// Generated with fastlane 2.167.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.37]
+// FastlaneRunnerAPIVersion [0.9.42]

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/swift/main.swift

@@ -20,7 +20,7 @@ class MainProcess {
     @objc func connectToFastlaneAndRunLane() {
         runner.startSocketThread(port: argumentProcessor.port)
 
-        let completedRun = Fastfile.runLane(from: nil, named: argumentProcessor.currentLane, parameters: argumentProcessor.laneParameters())
+        let completedRun = Fastfile.runLane(from: nil, named: argumentProcessor.currentLane, with: argumentProcessor.laneParameters())
         if completedRun {
             runner.disconnectFromFastlaneProcess()
         }

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/device_manager.rb

@@ -301,7 +301,7 @@ module FastlaneCore
         Helper.backticks("open -a #{simulator_path} --args -CurrentDeviceUDID #{device.udid}", print: FastlaneCore::Globals.verbose?)
       end
 
-      def copy_logs(device, log_identity, logs_destination_dir)
+      def copy_logs(device, log_identity, logs_destination_dir, log_collection_start_time)
         logs_destination_dir = File.expand_path(logs_destination_dir)
         os_version = FastlaneCore::CommandExecutor.execute(command: 'sw_vers -productVersion', print_all: false, print_command: false)
 
@@ -310,7 +310,7 @@ module FastlaneCore
 
         are_logarchives_supported = device_supports_logarchives && host_computer_supports_logarchives
         if are_logarchives_supported
-          copy_logarchive(device, log_identity, logs_destination_dir)
+          copy_logarchive(device, log_identity, logs_destination_dir, log_collection_start_time)
         else
           copy_logfile(device, log_identity, logs_destination_dir)
         end
@@ -340,13 +340,17 @@ module FastlaneCore
         UI.success("Copying file '#{logfile_src}' to '#{logfile_dst}'...")
       end
 
-      def copy_logarchive(device, log_identity, logs_destination_dir)
+      def copy_logarchive(device, log_identity, logs_destination_dir, log_collection_start_time)
         require 'shellwords'
 
         logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive")
         FileUtils.rm_rf(logarchive_dst)
         FileUtils.mkdir_p(File.expand_path("..", logarchive_dst))
-        command = "xcrun simctl spawn #{device.udid} log collect --output #{logarchive_dst.shellescape} 2>/dev/null"
+
+        logs_collection_start = log_collection_start_time.strftime('%Y-%m-%d %H:%M:%S')
+        command = "xcrun simctl spawn #{device.udid} log collect "
+        command << "--start '#{logs_collection_start}' "
+        command << "--output #{logarchive_dst.shellescape} 2>/dev/null"
         FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
       end
     end

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -66,7 +66,7 @@ module FastlaneCore
 
     # @return true if it is enabled to execute external commands
     def self.sh_enabled?
-      !self.test?
+      !self.test? || ENV["FORCE_SH_DURING_TESTS"]
     end
 
     # @return [boolean] true if building in a known CI environment
@@ -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/keychain_importer.rb

@@ -39,7 +39,7 @@ module FastlaneCore
       # See https://openradar.appspot.com/28524119
       if Helper.backticks('security -h | grep set-key-partition-list', print: false).length > 0
         command = "security set-key-partition-list"
-        command << " -S apple-tool:,apple:"
+        command << " -S apple-tool:,apple:,codesign:"
         command << " -s" # This is a needed in Catalina to prevent "security: SecKeychainItemCopyAccess: A missing value was detected."
         command << " -k #{keychain_password.to_s.shellescape}"
         command << " #{keychain_path.shellescape}"

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/package_command_generator_xcode7.rb

@@ -66,14 +66,14 @@ module Gym
         if path
           # Try to find IPA file in the output directory, used when app thinning was not set
           Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
-          FileUtils.mv(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
+          FileUtils.mv(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp?(File.expand_path(Gym.cache[:ipa_path]).downcase)
         elsif Dir.exist?(apps_path)
           # Try to find "generic" IPA file inside "Apps" folder, used when app thinning was set
           files = Dir[File.join(apps_path, "*.ipa")]
           # Generic IPA file doesn't have suffix so its name is the shortest
           path = files.min_by(&:length)
           Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
-          FileUtils.cp(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
+          FileUtils.cp(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp?(File.expand_path(Gym.cache[:ipa_path]).downcase)
         else
           ErrorHandler.handle_empty_archive unless path
         end