Merge pull request #612 from itaiferber/revert-611-swift-3.0-branch

Revert "Integration of Swift 3 Foundation changes"

Author: ddunbar

Sources/Basic/Condition.swift

@@ -10,6 +10,11 @@
 
 import Foundation
 
+// FIXME: Temporary compatibility shims.
+#if !os(macOS)
+private typealias NSCondition = Foundation.Condition
+#endif
+
 /// A simple condition wrapper.
 public struct Condition {
     private let _condition = NSCondition()

Sources/Basic/Lock.swift

@@ -10,6 +10,11 @@
 
 import Foundation
 
+// FIXME: Temporary compatibility shims.
+#if !os(macOS)
+private typealias NSLock = Foundation.Lock
+#endif
+
 /// A simple lock wrapper.
 public struct Lock {
     private var _lock = NSLock()

Sources/Basic/Thread.swift

@@ -47,7 +47,7 @@ final public class Thread {
             }
         }
 
-        self.thread = ThreadImpl(block: theTask)
+        self.thread = ThreadImpl(theTask)
     }
 
     /// Starts the thread execution.

Sources/Commands/SwiftTestTool.swift

@@ -291,7 +291,11 @@ public struct SwiftTestTool: SwiftTool {
 
         // Execute the XCTest with inherited environment as it is convenient to pass senstive
         // information like username, password etc to test cases via enviornment variables.
+      #if os(Linux)
+        let result: Void? = try? system(args, environment: ProcessInfo.processInfo().environment)
+      #else
         let result: Void? = try? system(args, environment: ProcessInfo.processInfo.environment)
+      #endif
         return result != nil
     }
 

Sources/Get/Git.swift

@@ -25,7 +25,11 @@ extension Git {
         }
 
         do {
+          #if os(Linux)
+            let env = ProcessInfo.processInfo().environment
+          #else
             let env = ProcessInfo.processInfo.environment
+          #endif
             try system(Git.tool, "clone",
                        "--recursive",   // get submodules too so that developers can use these if they so choose
                 "--depth", "10",

Sources/SourceControl/GitRepository.swift

@@ -47,7 +47,11 @@ public class GitRepositoryProvider: RepositoryProvider {
         do {
             // FIXME: We need infrastructure in this subsystem for reporting
             // status information.
+          #if os(Linux)
+            let env = ProcessInfo.processInfo().environment
+          #else
             let env = ProcessInfo.processInfo.environment
+          #endif
             try system(
                 Git.tool, "clone", "--bare", repository.url, path.asString,
                 environment: env, message: "Cloning \(repository.url)")

Sources/Utility/Git.swift

@@ -121,7 +121,11 @@ public class Git {
         }
 
         public func fetch() throws {
+#if os(Linux)
+            try system(Git.tool, "-C", path.asString, "fetch", "--tags", "origin", environment: ProcessInfo.processInfo().environment, message: nil)
+#else
             try system(Git.tool, "-C", path.asString, "fetch", "--tags", "origin", environment: ProcessInfo.processInfo.environment, message: nil)
+#endif
         }
     }