[Fastlane.Swift] Swift fastlane does not run on Apple Silicon fastlan…

…e#18502 * [Swift] Stick to swift 4, as suggested by reviewers.
kikeenrique · Dec 2, 2021 · 8a149fe · 8a149fe
1 parent 4d1fbf8
commit 8a149fe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Package.swift b/Package.swift
@@ -18,6 +18,6 @@ let package = Package(
             exclude: ["Actions.swift", "Plugins.swift", "main.swift", "formatting", "FastlaneSwiftRunner"]
         ),
     ],
-    swiftLanguageVersions: [5]
+    swiftLanguageVersions: [4]
 )
 
diff --git a/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj b/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj
@@ -402,7 +402,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -413,7 +413,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/fastlane/swift/SocketClient.swift b/fastlane/swift/SocketClient.swift
@@ -79,8 +79,8 @@ class SocketClient: NSObject {
             self.inputStream.delegate = self
             self.outputStream.delegate = self
 
-            self.inputStream.schedule(in: .main, forMode: .default)
-            self.outputStream.schedule(in: .main, forMode: .default)
+            self.inputStream.schedule(in: .main, forMode: RunLoopMode.defaultRunLoopMode)
+            self.outputStream.schedule(in: .main, forMode: RunLoopMode.defaultRunLoopMode)
         }
 
         dispatchGroup.enter()

diff --git a/fastlane/swift/main.swift b/fastlane/swift/main.swift
@@ -38,7 +38,7 @@ class MainProcess {
 let process = MainProcess()
 process.startFastlaneThread()
 
-while !process.doneRunningLane, RunLoop.current.run(mode: .default, before: Date(timeIntervalSinceNow: 2)) {
+while !process.doneRunningLane, RunLoop.current.run(mode: RunLoopMode.defaultRunLoopMode, before: Date(timeIntervalSinceNow: 2)) {
     // no op
 }