fastlane 2.98.0 → 2.99.0

data/fastlane/lib/fastlane/lane_manager.rb

@@ -42,9 +42,6 @@ module Fastlane
 
       platform, lane = choose_lane(ff, platform) unless lane
 
-      # https://github.com/fastlane/fastlane/issues/11913
-      # FastlaneCore.session.is_fastfile = true
-
       # xcodeproj has a bug in certain versions that causes it to change directories
       # and not return to the original working directory
       # https://github.com/CocoaPods/Xcodeproj/issues/426

data/fastlane/lib/fastlane/runner.rb

@@ -224,10 +224,6 @@ module Fastlane
       verify_supported_os(method_sym, class_ref)
 
       begin
-        # https://github.com/fastlane/fastlane/issues/11913
-        # launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(method_sym.to_s, configuration_language: configuration_language, args: ARGV)
-        # FastlaneCore.session.action_launched(launch_context: launch_context)
-
         Dir.chdir(custom_dir) do # go up from the fastlane folder, to the project folder
           # If another action is calling this action, we shouldn't show it in the summary
           # (see https://github.com/fastlane/fastlane/issues/4546)
@@ -254,11 +250,7 @@ module Fastlane
               puts("==========================================\n".deprecated)
             end
             class_ref.runner = self # needed to call another action form an action
-            return_value = class_ref.run(arguments)
-
-            action_completed(method_sym.to_s, status: FastlaneCore::ActionCompletionStatus::SUCCESS)
-
-            return return_value
+            return class_ref.run(arguments)
           end
         end
       rescue Interrupt => e

data/fastlane/lib/fastlane/server/socket_server.rb

@@ -19,7 +19,8 @@ module Fastlane
       command_executor: nil,
       return_value_processor: nil,
       connection_timeout: 5,
-      stay_alive: false
+      stay_alive: false,
+      port: 2000
     )
       if return_value_processor.nil?
         return_value_processor = JSONReturnValueProcessor.new
@@ -29,6 +30,7 @@ module Fastlane
       @return_value_processor = return_value_processor
       @connection_timeout = connection_timeout.to_i
       @stay_alive = stay_alive
+      @port = port.to_i
     end
 
     # this is the public API, don't call anything else
@@ -135,7 +137,7 @@ module Fastlane
     end
 
     def listen
-      @server = TCPServer.open('localhost', 2000) # Socket to listen on port 2000
+      @server = TCPServer.open('localhost', @port) # Socket to listen on port 2000
       UI.verbose("Waiting for #{@connection_timeout} seconds for a connection from FastlaneRunner")
 
       # set thread local to ready so we can check it

data/fastlane/lib/fastlane/setup/setup_ios.rb

@@ -204,10 +204,10 @@ module Fastlane
       ui_testing_scheme = UI.select("Which is your UI Testing scheme? If you can't find it in this list, make sure it's marked as `Shared` in the Xcode scheme list", available_schemes)
 
       UI.header("Automatically upload to iTC?")
-      UI.message("Would you like fastlane to automatically upload all generated screenshots to iTunes Connect")
+      UI.message("Would you like fastlane to automatically upload all generated screenshots to App Store Connect")
       UI.message("after generating them?")
-      UI.message("If you enable this feature you'll need to provide your iTunes Connect credentials so fastlane can upload the screenshots to iTunes Connect")
-      automatic_upload = UI.confirm("Enable automatic upload of localized screenshots to iTunes Connect?")
+      UI.message("If you enable this feature you'll need to provide your App Store Connect credentials so fastlane can upload the screenshots to App Store Connect")
+      automatic_upload = UI.confirm("Enable automatic upload of localized screenshots to App Store Connect?")
       if automatic_upload
         ask_for_credentials(adp: true, itc: true)
         verify_app_exists_itc!
@@ -293,13 +293,13 @@ module Fastlane
 
     def ask_for_credentials(itc: true, adp: false)
       UI.header("Login with your Apple ID")
-      UI.message("To use iTunes Connect and Apple Developer Portal features as part of fastlane,")
+      UI.message("To use App Store Connect and Apple Developer Portal features as part of fastlane,")
       UI.message("we will ask you for your Apple ID username and password")
       UI.message("This is necessary for certain fastlane features, for example:")
       UI.message("")
       UI.message("- Create and manage your provisioning profiles on the Developer Portal")
-      UI.message("- Upload and manage TestFlight and App Store builds on iTunes Connect")
-      UI.message("- Manage your iTunes Connect app metadata and screenshots")
+      UI.message("- Upload and manage TestFlight and App Store builds on App Store Connect")
+      UI.message("- Manage your App Store Connect app metadata and screenshots")
       UI.message("")
       UI.message("Your Apple ID credentials will only be stored in your Keychain, on your local machine")
       UI.message("For more information, check out")
@@ -321,9 +321,9 @@ module Fastlane
         Spaceship::Tunes.select_team
         self.itc_team_id = Spaceship::Tunes.client.team_id
         if self.is_swift_fastfile
-          self.append_team("var itcTeam: String? { return \"#{self.itc_team_id}\" } // iTunes Connect Team ID")
+          self.append_team("var itcTeam: String? { return \"#{self.itc_team_id}\" } // App Store Connect Team ID")
         else
-          self.append_team("itc_team_id(\"#{self.itc_team_id}\") # iTunes Connect Team ID")
+          self.append_team("itc_team_id(\"#{self.itc_team_id}\") # App Store Connect Team ID")
         end
       end
 
@@ -386,19 +386,19 @@ module Fastlane
 
     def verify_app_exists_itc!
       UI.user_error!("No app identifier provided") if self.app_identifier.to_s.length == 0
-      UI.message("Checking if the app '#{self.app_identifier}' exists on iTunes Connect...")
+      UI.message("Checking if the app '#{self.app_identifier}' exists on App Store Connect...")
       app = Spaceship::Tunes::Application.find(self.app_identifier)
       if app.nil?
-        UI.error("Looks like the app '#{self.app_identifier}' isn't available on #{'iTunes Connect'.bold.underline}")
+        UI.error("Looks like the app '#{self.app_identifier}' isn't available on #{'App Store Connect'.bold.underline}")
         UI.error("for the team ID '#{self.itc_team_id}' on Apple ID '#{self.user}'")
-        if UI.confirm("Would you like fastlane to create the App on iTunes Connect for you?")
+        if UI.confirm("Would you like fastlane to create the App on App Store Connect for you?")
           create_app_online!(mode: :itc)
           self.app_exists_on_itc = true
         else
           UI.important("Alright, we won't create the app for you. Be aware, the build is probably going to fail when you try it")
         end
       else
-        UI.success("✅  Your app '#{self.app_identifier}' is available on iTunes Connect")
+        UI.success("✅  Your app '#{self.app_identifier}' is available on App Store Connect")
         self.app_exists_on_itc = true
       end
     end

data/fastlane/lib/fastlane/swift_lane_manager.rb

@@ -6,7 +6,7 @@ module Fastlane
     # @param lane_name The name of the lane to execute
     # @param parameters [Hash] The parameters passed from the command line to the lane
     # @param env Dot Env Information
-    def self.cruise_lane(lane, parameters = nil, env = nil, disable_runner_upgrades: false)
+    def self.cruise_lane(lane, parameters = nil, env = nil, disable_runner_upgrades: false, swift_server_port: nil)
       UI.user_error!("lane must be a string") unless lane.kind_of?(String) || lane.nil?
       UI.user_error!("parameters must be a hash") unless parameters.kind_of?(Hash) || parameters.nil?
 
@@ -15,8 +15,6 @@ module Fastlane
       # https://github.com/CocoaPods/Xcodeproj/issues/426
       # Setting this environment variable causes xcodeproj to work around the problem
       ENV["FORK_XCODE_WRITING"] = "true"
-      # https://github.com/fastlane/fastlane/issues/11913
-      # FastlaneCore.session.is_fastfile = true
 
       Fastlane::Helper::DotenvHelper.load_dot_env(env)
 
@@ -33,10 +31,11 @@ module Fastlane
         end
 
         self.ensure_runner_built!
-        socket_thread = self.start_socket_thread
+        swift_server_port ||= 2000
+        socket_thread = self.start_socket_thread(port: swift_server_port)
         sleep(0.250) while socket_thread[:ready].nil?
         # wait on socket_thread to be in ready state, then start the runner thread
-        self.cruise_swift_lane_in_thread(lane, parameters)
+        self.cruise_swift_lane_in_thread(lane, parameters, swift_server_port)
 
         socket_thread.join
       rescue Exception => ex # rubocop:disable Lint/RescueException
@@ -82,7 +81,7 @@ module Fastlane
       Actions.sh(%(#{FastlaneCore::FastlaneFolder.swift_runner_path} lanes))
     end
 
-    def self.cruise_swift_lane_in_thread(lane, parameters = nil)
+    def self.cruise_swift_lane_in_thread(lane, parameters = nil, swift_server_port)
       if parameters.nil?
         parameters = {}
       end
@@ -96,6 +95,8 @@ module Fastlane
         parameter_string += " logMode verbose"
       end
 
+      parameter_string += " swiftServerPort #{swift_server_port}"
+
       return Thread.new do
         Actions.sh(%(#{FastlaneCore::FastlaneFolder.swift_runner_path} lane #{lane}#{parameter_string} > /dev/null))
       end
@@ -216,13 +217,13 @@ module Fastlane
       return project_modified
     end
 
-    def self.start_socket_thread
+    def self.start_socket_thread(port: nil)
       require 'fastlane/server/socket_server'
       require 'fastlane/server/socket_server_action_command_executor'
 
       return Thread.new do
         command_executor = SocketServerActionCommandExecutor.new
-        server = Fastlane::SocketServer.new(command_executor: command_executor)
+        server = Fastlane::SocketServer.new(command_executor: command_executor, port: port)
         server.start
       end
     end

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.98.0'.freeze
+  VERSION = '2.99.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Appfile.swift

@@ -7,7 +7,7 @@ var appIdentifier: String { return "" } // The bundle identifier of your app
 var appleID: String { return "" } // Your Apple email address
 
 var teamID: String { return "" } // Developer Portal Team ID
-var itcTeam: String? { return nil } // iTunes Connect Team ID (may be nil if no team)
+var itcTeam: String? { return nil } // App Store Connect Team ID (may be nil if no team)
 
 // you can even provide different app identifiers, Apple IDs and team names per lane:
 // More information: https://docs.fastlane.tools/advanced/#appfile

data/fastlane/swift/ArgumentProcessor.swift

@@ -3,7 +3,6 @@
 //  FastlaneRunner
 //
 //  Created by Joshua Liebowitz on 9/28/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //
@@ -19,6 +18,7 @@ struct ArgumentProcessor {
     let args: [RunnerArgument]
     let currentLane: String
     let commandTimeout: Int
+    let port: UInt32
     
     init(args: [String]) {        
         // Dump the first arg which is the program name
@@ -35,6 +35,8 @@ struct ArgumentProcessor {
             return arg.name.lowercased() == "logmode"
         }
         
+        port = UInt32(fastlaneArgsMinusLanes.first(where: { $0.name == "swiftServerPort" })?.value ?? "") ?? 2000
+        
         // Configure logMode since we might need to use it before we finish parsing
         if let logModeArg = potentialLogMode.first {
             let logModeString = logModeArg.value

data/fastlane/swift/ControlCommand.swift

@@ -3,7 +3,6 @@
 //  FastlaneRunner
 //
 //  Created by Joshua Liebowitz on 1/3/18.
-//  Copyright © 2018 Joshua Liebowitz. All rights reserved.
 
 //
 //  ** NOTE **

data/fastlane/swift/Deliverfile.swift

@@ -18,4 +18,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.98.0
+// Generated with fastlane 2.99.0

data/fastlane/swift/Fastlane.swift

@@ -994,7 +994,7 @@ func cocoapods(clean: Bool = true,
                useBundleExec: Bool = true,
                podfile: String? = nil,
                errorCallback: String? = nil,
-               tryRepoUpdateOnError: Bool? = nil) {
+               tryRepoUpdateOnError: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "cocoapods", className: nil, args: [RubyCommand.Argument(name: "clean", value: clean),
                                                                                            RubyCommand.Argument(name: "integrate", value: integrate),
                                                                                            RubyCommand.Argument(name: "repo_update", value: repoUpdate),
@@ -3945,7 +3945,7 @@ func xcov(workspace: String? = nil,
           coverallsServiceJobId: String? = nil,
           coverallsRepoToken: String? = nil,
           xcconfig: String? = nil,
-          ideFoundationPath: String = "/Applications/Xcode92/Xcode.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
+          ideFoundationPath: String = "/Applications/Xcode.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
           legacySupport: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "xcov", className: nil, args: [RubyCommand.Argument(name: "workspace", value: workspace),
                                                                                       RubyCommand.Argument(name: "project", value: project),
@@ -4051,4 +4051,4 @@ let screengrabfile: Screengrabfile = Screengrabfile()
 let snapshotfile: Snapshotfile = Snapshotfile()
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.21]
+// FastlaneRunnerAPIVersion [0.9.22]

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.98.0
+// Generated with fastlane 2.99.0

data/fastlane/swift/LaneFileProtocol.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 8/4/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.98.0
+// Generated with fastlane 2.99.0

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.98.0
+// Generated with fastlane 2.99.0

data/fastlane/swift/RubyCommand.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 8/4/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //

data/fastlane/swift/RubyCommandable.swift

@@ -3,7 +3,6 @@
 //  FastlaneRunner
 //
 //  Created by Joshua Liebowitz on 1/4/18.
-//  Copyright © 2018 Joshua Liebowitz. All rights reserved.
 //
 
 //

data/fastlane/swift/Runner.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 8/26/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //
@@ -34,7 +33,7 @@ class Runner {
     fileprivate var returnValue: String? // lol, so safe
     fileprivate var currentlyExecutingCommand: RubyCommandable? = nil
     fileprivate var shouldLeaveDispatchGroupDuringDisconnect = false
-
+    
     func executeCommand(_ command: RubyCommandable) -> String {
         self.dispatchGroup.enter()
         currentlyExecutingCommand = command
@@ -60,12 +59,12 @@ class Runner {
 
 // Handle threading stuff
 extension Runner {
-    func startSocketThread() {
+    func startSocketThread(port: UInt32) {
         let secondsToWait = DispatchTimeInterval.seconds(SocketClient.connectTimeoutSeconds)
         
         self.dispatchGroup.enter()
         
-        self.socketClient = SocketClient(commandTimeoutSeconds:timeout, socketDelegate: self)
+        self.socketClient = SocketClient(port: port, commandTimeoutSeconds:timeout, socketDelegate: self)
         self.thread = Thread(target: self, selector: #selector(startSocketComs), object: nil)
         self.thread!.name = "socket thread"
         self.thread!.start()
@@ -94,7 +93,7 @@ extension Runner {
         guard let socketClient = self.socketClient else {
             return
         }
-
+        
         socketClient.connectAndOpenStreams()
         self.dispatchGroup.leave()
     }
@@ -125,11 +124,11 @@ extension Runner : SocketClientDelegateProtocol {
         case .clientInitiatedCancelAcknowledged:
             verbose(message: "server acknowledged a cancel request")
             self.dispatchGroup.leave()
-
+            
         case .alreadyClosedSockets, .connectionFailure, .malformedRequest, .malformedResponse, .serverError:
             log(message: "error encountered while executing command:\n\(serverResponse)")
             self.dispatchGroup.leave()
-
+            
         case .commandTimeout(let timeout):
             log(message: "Runner timed out after \(timeout) second(s)")
         }
@@ -198,3 +197,4 @@ func verbose(message: String) {
 // Please don't remove the lines below
 // They are used to detect outdated files
 // FastlaneRunnerAPIVersion [0.9.2]
+

data/fastlane/swift/RunnerArgument.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 9/1/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.98.0
+// Generated with fastlane 2.99.0

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.98.0
+// Generated with fastlane 2.99.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.98.0
+// Generated with fastlane 2.99.0

data/fastlane/swift/SocketClient.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 7/30/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //

data/fastlane/swift/SocketClientDelegateProtocol.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 8/12/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //

data/fastlane/swift/SocketResponse.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 7/30/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //

data/fastlane/swift/main.swift

@@ -3,7 +3,6 @@
 //  FastlaneSwiftRunner
 //
 //  Created by Joshua Liebowitz on 8/26/17.
-//  Copyright © 2017 Joshua Liebowitz. All rights reserved.
 //
 
 //
@@ -23,7 +22,7 @@ class MainProcess {
     var thread: Thread!
     
     @objc func connectToFastlaneAndRunLane() {
-        runner.startSocketThread()
+        runner.startSocketThread(port: argumentProcessor.port)
         
         let completedRun = Fastfile.runLane(named: argumentProcessor.currentLane, parameters: argumentProcessor.laneParameters())
         if completedRun {
@@ -50,3 +49,4 @@ while (!process.doneRunningLane && (RunLoop.current.run(mode: RunLoopMode.defaul
 // Please don't remove the lines below
 // They are used to detect outdated files
 // FastlaneRunnerAPIVersion [0.9.2]
+