fastlane 2.157.2 → 2.160.0

data/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		0311E387230AC1B20060BB5C /* Plugins.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0311E386230AC1B20060BB5C /* Plugins.swift */; };
 		0311E38B230AC9490060BB5C /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0311E38A230AC9490060BB5C /* Actions.swift */; };
+		1257253924B7992C00E04FA3 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1257253824B7992B00E04FA3 /* main.swift */; };
 		B302067B1F5E3E9000DE6EBD /* SnapshotfileProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30206741F5E3E9000DE6EBD /* SnapshotfileProtocol.swift */; };
 		B302067C1F5E3E9000DE6EBD /* GymfileProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30206751F5E3E9000DE6EBD /* GymfileProtocol.swift */; };
 		B302067D1F5E3E9000DE6EBD /* MatchfileProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30206761F5E3E9000DE6EBD /* MatchfileProtocol.swift */; };
@@ -18,7 +19,6 @@
 		B30206811F5E3E9000DE6EBD /* DeliverfileProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B302067A1F5E3E9000DE6EBD /* DeliverfileProtocol.swift */; };
 		B3BA65A61F5A269100B34850 /* Fastlane.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA659D1F5A269100B34850 /* Fastlane.swift */; };
 		B3BA65A71F5A269100B34850 /* LaneFileProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA659E1F5A269100B34850 /* LaneFileProtocol.swift */; };
-		B3BA65A81F5A269100B34850 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA659F1F5A269100B34850 /* main.swift */; };
 		B3BA65A91F5A269100B34850 /* RubyCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA65A01F5A269100B34850 /* RubyCommand.swift */; };
 		B3BA65AA1F5A269100B34850 /* Runner.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA65A11F5A269100B34850 /* Runner.swift */; };
 		B3BA65AB1F5A269100B34850 /* SocketClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA65A21F5A269100B34850 /* SocketClient.swift */; };
@@ -42,6 +42,7 @@
 /* Begin PBXFileReference section */
 		0311E386230AC1B20060BB5C /* Plugins.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Plugins.swift; path = ../Plugins.swift; sourceTree = "<group>"; };
 		0311E38A230AC9490060BB5C /* Actions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Actions.swift; path = ../Actions.swift; sourceTree = "<group>"; };
+		1257253824B7992B00E04FA3 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = ../main.swift; sourceTree = "<group>"; };
 		B30206741F5E3E9000DE6EBD /* SnapshotfileProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotfileProtocol.swift; path = ../SnapshotfileProtocol.swift; sourceTree = "<group>"; };
 		B30206751F5E3E9000DE6EBD /* GymfileProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GymfileProtocol.swift; path = ../GymfileProtocol.swift; sourceTree = "<group>"; };
 		B30206761F5E3E9000DE6EBD /* MatchfileProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MatchfileProtocol.swift; path = ../MatchfileProtocol.swift; sourceTree = "<group>"; };
@@ -55,7 +56,6 @@
 		B3144C0A200553DC00470AFE /* README.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
 		B3BA659D1F5A269100B34850 /* Fastlane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Fastlane.swift; path = ../Fastlane.swift; sourceTree = "<group>"; };
 		B3BA659E1F5A269100B34850 /* LaneFileProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LaneFileProtocol.swift; path = ../LaneFileProtocol.swift; sourceTree = "<group>"; };
-		B3BA659F1F5A269100B34850 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = ../main.swift; sourceTree = "<group>"; };
 		B3BA65A01F5A269100B34850 /* RubyCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RubyCommand.swift; path = ../RubyCommand.swift; sourceTree = "<group>"; };
 		B3BA65A11F5A269100B34850 /* Runner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Runner.swift; path = ../Runner.swift; sourceTree = "<group>"; };
 		B3BA65A21F5A269100B34850 /* SocketClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketClient.swift; path = ../SocketClient.swift; sourceTree = "<group>"; };
@@ -161,9 +161,9 @@
 		D512BA011F7C7F40000D2137 /* Runner Code */ = {
 			isa = PBXGroup;
 			children = (
+				1257253824B7992B00E04FA3 /* main.swift */,
 				B3144C0A200553DC00470AFE /* README.txt */,
 				D5BAFD111F7DAAFC0030B324 /* ArgumentProcessor.swift */,
-				B3BA659F1F5A269100B34850 /* main.swift */,
 				B3BA65AE1F5A2D5C00B34850 /* RunnerArgument.swift */,
 			);
 			name = "Runner Code";
@@ -236,7 +236,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"${SRCROOT}\"\ncd ../..\ncp \"${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\" .";
+			shellScript = "cd \"${SRCROOT}\"\ncd ../..\ncp \"${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\" .\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -267,9 +267,9 @@
 				B3BA65AA1F5A269100B34850 /* Runner.swift in Sources */,
 				B3BA65AF1F5A2D5C00B34850 /* RunnerArgument.swift in Sources */,
 				D5B8A5B31FFDC49E00536B24 /* ControlCommand.swift in Sources */,
+				1257253924B7992C00E04FA3 /* main.swift in Sources */,
 				B302067E1F5E3E9000DE6EBD /* PrecheckfileProtocol.swift in Sources */,
 				B3BA65AD1F5A269100B34850 /* SocketResponse.swift in Sources */,
-				B3BA65A81F5A269100B34850 /* main.swift in Sources */,
 				D55B28C71F6C588300DC42C5 /* Scanfile.swift in Sources */,
 				0311E387230AC1B20060BB5C /* Plugins.swift in Sources */,
 				D55B28C91F6C588300DC42C5 /* Snapshotfile.swift in Sources */,

data/fastlane/swift/Gymfile.swift

@@ -1,3 +1,6 @@
+// Gymfile.swift
+// Copyright (c) 2020 FastlaneTools
+
 // This class is automatically included in FastlaneRunner during build
 
 // This autogenerated file will be overwritten or replaced during build time, or when you initialize `gym`
@@ -8,10 +11,10 @@
 //  new group so that it won't be marked for upgrade
 //
 
-class Gymfile: GymfileProtocol {
+public class Gymfile: GymfileProtocol {
     // If you want to enable `gym`, run `fastlane gym init`
     // After, this file will be replaced with a custom implementation that contains values you supplied
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.2
+// Generated with fastlane 2.160.0

data/fastlane/swift/GymfileProtocol.swift

@@ -1,4 +1,7 @@
-protocol GymfileProtocol: class {
+// GymfileProtocol.swift
+// Copyright (c) 2020 FastlaneTools
+
+public protocol GymfileProtocol: class {
     /// Path to the workspace file
     var workspace: String? { get }
 
@@ -132,7 +135,7 @@ protocol GymfileProtocol: class {
     var clonedSourcePackagesPath: String? { get }
 }
 
-extension GymfileProtocol {
+public extension GymfileProtocol {
     var workspace: String? { return nil }
     var project: String? { return nil }
     var scheme: String? { return nil }
@@ -181,4 +184,4 @@ extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.40]
+// FastlaneRunnerAPIVersion [0.9.46]

data/fastlane/swift/LaneFileProtocol.swift

@@ -1,9 +1,5 @@
-//
-//  LaneFileProtocol.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 8/4/17.
-//
+// LaneFileProtocol.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **
@@ -16,7 +12,7 @@ import Foundation
 
 public protocol LaneFileProtocol: class {
     var fastlaneVersion: String { get }
-    static func runLane(named: String, parameters: [String: String]) -> Bool
+    static func runLane(from fastfile: LaneFile?, named: String, parameters: [String: String]) -> Bool
 
     func recordLaneDescriptions()
     func beforeAll()
@@ -33,8 +29,8 @@ public extension LaneFileProtocol {
 }
 
 @objcMembers
-public class LaneFile: NSObject, LaneFileProtocol {
-    private(set) static var fastfileInstance: Fastfile?
+open class LaneFile: NSObject, LaneFileProtocol {
+    private(set) static var fastfileInstance: LaneFile?
 
     // Called before any lane is executed.
     private func setupAllTheThings() {
@@ -52,7 +48,14 @@ public class LaneFile: NSObject, LaneFileProtocol {
     private static var laneFunctionNames: [String] {
         var lanes: [String] = []
         var methodCount: UInt32 = 0
-        let methodList = class_copyMethodList(self, &methodCount)
+        #if !SWIFT_PACKAGE
+            let methodList = class_copyMethodList(self, &methodCount)
+        #else
+            // In SPM we're calling this functions out of the scope of the normal binary that it
+            // is being built, so self in this scope would be the SPM executable instead of the Fastfile
+            // that we'd normally expect.
+            let methodList = class_copyMethodList(type(of: fastfileInstance!), &methodCount)
+        #endif
         for i in 0 ..< Int(methodCount) {
             let selName = sel_getName(method_getName(methodList![i]))
             let name = String(cString: selName)
@@ -92,16 +95,30 @@ public class LaneFile: NSObject, LaneFileProtocol {
         }
     }
 
-    public static func runLane(named: String, parameters: [String: String]) -> Bool {
+    public static func runLane(from fastfile: LaneFile?, named: String, parameters: [String: String]) -> Bool {
         log(message: "Running lane: \(named)")
-        loadFastfile()
-
-        guard let fastfileInstance: Fastfile = self.fastfileInstance else {
-            let message = "Unable to instantiate class named: \(className())"
-            log(message: message)
-            fatalError(message)
-        }
-
+        #if !SWIFT_PACKAGE
+            // In SPM we do not load the Fastfile class from its `className()`, because we're in another
+            // in the executable's scope that loads the library, so in that case `className()` won't be the
+            // expected Fastfile and so, we do not dynamically load it as we do without SPM.
+            loadFastfile()
+        #endif
+
+        #if !SWIFT_PACKAGE
+            guard let fastfileInstance: LaneFile = self.fastfileInstance else {
+                let message = "Unable to instantiate class named: \(className())"
+                log(message: message)
+                fatalError(message)
+            }
+        #else
+            // We load the fastfile as a Lanefile in a static way, by parameter, because the Fastlane library
+            // cannot know nothing about the caller (in this case, the executable).
+            guard let fastfileInstance: LaneFile = fastfile else {
+                log(message: "Found nil instance of fastfile")
+                preconditionFailure()
+            }
+        #endif
+        self.fastfileInstance = fastfile!
         let currentLanes = lanes
         let lowerCasedLaneRequested = named.lowercased()
 

data/fastlane/swift/MainProcess.swift

@@ -0,0 +1,77 @@
+// MainProcess.swift
+// Copyright (c) 2020 FastlaneTools
+
+//
+//  ** NOTE **
+//  This file is provided by fastlane and WILL be overwritten in future updates
+//  If you want to add extra functionality to this project, create a new file in a
+//  new group so that it won't be marked for upgrade
+//
+
+import Foundation
+#if canImport(SwiftShell)
+    import SwiftShell
+#endif
+
+let argumentProcessor = ArgumentProcessor(args: CommandLine.arguments)
+let timeout = argumentProcessor.commandTimeout
+
+class MainProcess {
+    var doneRunningLane = false
+    var thread: Thread!
+    #if SWIFT_PACKAGE
+        var lastPrintDate = Date.distantFuture
+        var timeBetweenPrints = Int.min
+        var rubySocketCommand: AsyncCommand!
+    #endif
+
+    @objc func connectToFastlaneAndRunLane(_ fastfile: LaneFile?) {
+        runner.startSocketThread(port: argumentProcessor.port)
+
+        let completedRun = Fastfile.runLane(from: fastfile, named: argumentProcessor.currentLane, parameters: argumentProcessor.laneParameters())
+        if completedRun {
+            runner.disconnectFromFastlaneProcess()
+        }
+
+        doneRunningLane = true
+    }
+
+    func startFastlaneThread(with fastFile: LaneFile?) {
+        #if !SWIFT_PACKAGE
+            thread = Thread(target: self, selector: #selector(connectToFastlaneAndRunLane), object: nil)
+        #else
+            thread = Thread(target: self, selector: #selector(connectToFastlaneAndRunLane), object: fastFile)
+        #endif
+        thread.name = "worker thread"
+        #if SWIFT_PACKAGE
+            let PATH = run("/bin/bash", "-c", "-l", "eval $(/usr/libexec/path_helper -s) ; echo $PATH").stdout
+            main.env["PATH"] = PATH
+            let path = main.run(bash: "which fastlane").stdout
+            let pids = main.run("lsof", "-t", "-i", ":2000").stdout.split(separator: "\n")
+            pids.forEach { main.run("kill", "-9", $0) }
+            rubySocketCommand = main.runAsync(path, "socket_server", "-c", "1200")
+            lastPrintDate = Date()
+            rubySocketCommand.stderror.onStringOutput { print($0) }
+            rubySocketCommand.stdout.onStringOutput { stdout in
+                print(stdout)
+                self.timeBetweenPrints = Int(self.lastPrintDate.timeIntervalSinceNow)
+            }
+            _ = Runner.waitWithPolling(self.timeBetweenPrints, toEventually: { $0 > 5 }, timeout: 10)
+            thread.start()
+        #endif
+    }
+}
+
+public class Main {
+    let process = MainProcess()
+
+    public init() {}
+
+    public func run(with fastFile: LaneFile?) {
+        process.startFastlaneThread(with: fastFile)
+
+        while !process.doneRunningLane, RunLoop.current.run(mode: RunLoopMode.defaultRunLoopMode, before: Date(timeIntervalSinceNow: 2)) {
+            // no op
+        }
+    }
+}

data/fastlane/swift/Matchfile.swift

@@ -1,3 +1,6 @@
+// Matchfile.swift
+// Copyright (c) 2020 FastlaneTools
+
 // This class is automatically included in FastlaneRunner during build
 
 // This autogenerated file will be overwritten or replaced during build time, or when you initialize `match`
@@ -8,10 +11,10 @@
 //  new group so that it won't be marked for upgrade
 //
 
-class Matchfile: MatchfileProtocol {
+public class Matchfile: MatchfileProtocol {
     // If you want to enable `match`, run `fastlane match init`
     // After, this file will be replaced with a custom implementation that contains values you supplied
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.2
+// Generated with fastlane 2.160.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -1,4 +1,7 @@
-protocol MatchfileProtocol: class {
+// MatchfileProtocol.swift
+// Copyright (c) 2020 FastlaneTools
+
+public protocol MatchfileProtocol: class {
     /// Define the profile type, can be appstore, adhoc, development, enterprise, developer_id
     var type: String { get }
 
@@ -120,7 +123,7 @@ protocol MatchfileProtocol: class {
     var verbose: Bool { get }
 }
 
-extension MatchfileProtocol {
+public extension MatchfileProtocol {
     var type: String { return "development" }
     var additionalCertTypes: [String]? { return nil }
     var readonly: Bool { return false }
@@ -165,4 +168,4 @@ extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.34]
+// FastlaneRunnerAPIVersion [0.9.40]

data/fastlane/swift/Plugins.swift

@@ -1,4 +1,5 @@
-// This class is automatically included in FastlaneRunner during build
+// Plugins.swift
+// Copyright (c) 2020 FastlaneTools
 
 // This autogenerated file will be overwritten or replaced when installing/updating plugins or running "fastlane generate_swift"
 //

data/fastlane/swift/Precheckfile.swift

@@ -1,3 +1,6 @@
+// Precheckfile.swift
+// Copyright (c) 2020 FastlaneTools
+
 // This class is automatically included in FastlaneRunner during build
 
 // This autogenerated file will be overwritten or replaced during build time, or when you initialize `precheck`
@@ -8,10 +11,10 @@
 //  new group so that it won't be marked for upgrade
 //
 
-class Precheckfile: PrecheckfileProtocol {
+public class Precheckfile: PrecheckfileProtocol {
     // If you want to enable `precheck`, run `fastlane precheck init`
     // After, this file will be replaced with a custom implementation that contains values you supplied
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.2
+// Generated with fastlane 2.160.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -1,4 +1,13 @@
-protocol PrecheckfileProtocol: class {
+// PrecheckfileProtocol.swift
+// Copyright (c) 2020 FastlaneTools
+
+public protocol PrecheckfileProtocol: class {
+    /// Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)
+    var apiKeyPath: String? { get }
+
+    /// Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)
+    var apiKey: [String: Any]? { get }
+
     /// The bundle identifier of your app
     var appIdentifier: String { get }
 
@@ -11,6 +20,9 @@ protocol PrecheckfileProtocol: class {
     /// The name of your App Store Connect team if you're in multiple teams
     var teamName: String? { get }
 
+    /// The platform to use (optional)
+    var platform: String { get }
+
     /// The default rule level unless otherwise configured
     var defaultRuleLevel: String { get }
 
@@ -21,11 +33,14 @@ protocol PrecheckfileProtocol: class {
     var freeStuffInIap: String? { get }
 }
 
-extension PrecheckfileProtocol {
+public extension PrecheckfileProtocol {
+    var apiKeyPath: String? { return nil }
+    var apiKey: [String: Any]? { return nil }
     var appIdentifier: String { return "" }
     var username: String { return "" }
     var teamId: String? { return nil }
     var teamName: String? { return nil }
+    var platform: String { return "ios" }
     var defaultRuleLevel: String { return "error" }
     var includeInAppPurchases: Bool { return true }
     var freeStuffInIap: String? { return nil }
@@ -33,4 +48,4 @@ extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.33]
+// FastlaneRunnerAPIVersion [0.9.39]

data/fastlane/swift/RubyCommand.swift

@@ -1,9 +1,5 @@
-//
-//  RubyCommand.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 8/4/17.
-//
+// RubyCommand.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/RubyCommandable.swift

@@ -1,9 +1,5 @@
-//
-//  RubyCommandable.swift
-//  FastlaneRunner
-//
-//  Created by Joshua Liebowitz on 1/4/18.
-//
+// RubyCommandable.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/Runner.swift

@@ -1,9 +1,5 @@
-//
-//  Runner.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 8/26/17.
-//
+// Runner.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **
@@ -29,7 +25,7 @@ func desc(_: String) {
 class Runner {
     private var thread: Thread!
     private var socketClient: SocketClient!
-    private let dispatchGroup: DispatchGroup = DispatchGroup()
+    private let dispatchGroup = DispatchGroup()
     private var returnValue: String? // lol, so safe
     private var currentlyExecutingCommand: RubyCommandable?
     private var shouldLeaveDispatchGroupDuringDisconnect = false
@@ -42,7 +38,7 @@ class Runner {
 
         let secondsToWait = DispatchTimeInterval.seconds(SocketClient.defaultCommandTimeoutSeconds)
         // swiftlint:disable next
-        let timeoutResult = waitWithPolling(self.executeNext[command.id], toEventually: { $0 == true }, timeout: SocketClient.defaultCommandTimeoutSeconds)
+        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"
         let success = testDispatchTimeoutResult(timeoutResult, failureMessage: failureMessage, timeToWait: secondsToWait)
@@ -58,7 +54,7 @@ class Runner {
         }
     }
 
-    private func waitWithPolling<T>(_ expression: @autoclosure @escaping () throws -> T, toEventually predicate: @escaping (T) -> Bool, timeout: Int, pollingInterval: DispatchTimeInterval = .milliseconds(4)) -> DispatchTimeoutResult {
+    static func waitWithPolling<T>(_ expression: @autoclosure @escaping () throws -> T, toEventually predicate: @escaping (T) -> Bool, timeout: Int, pollingInterval: DispatchTimeInterval = .milliseconds(4)) -> DispatchTimeoutResult {
         func memoizedClosure<T>(_ closure: @escaping () throws -> T) -> (Bool) throws -> T {
             var cache: T?
             return { withoutCaching in