Adapt to Swift 3 Foundation API changes

Author: shahmishal

Sources/Basic/Lock.swift

@@ -8,11 +8,15 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import class Foundation.NSLock
+import Foundation
 
 /// A simple lock wrapper.
 public struct Lock {
+  #if os(OSX)
+    private var _lock = Foundation.Lock()
+  #else
     private var _lock = NSLock()
+  #endif
 
     /// Create a new lock.
     public init() {

Sources/Basic/Shims.swift

@@ -0,0 +1,21 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+ -------------------------------------------------------------------------
+
+ Platform-specific shims for the Swift3 transition.
+*/
+
+#if os(OSX)
+
+import Foundation
+
+public typealias NSJSONSerialization = JSONSerialization
+
+#endif

Sources/Commands/Shims.swift

@@ -0,0 +1,21 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+ -------------------------------------------------------------------------
+
+ Platform-specific shims for the Swift3 transition.
+*/
+
+#if os(OSX)
+
+import Foundation
+
+public typealias NSProcessInfo = ProcessInfo
+
+#endif

Sources/Get/Shims.swift

@@ -0,0 +1,21 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+ -------------------------------------------------------------------------
+
+ Platform-specific shims for the Swift3 transition.
+*/
+
+#if os(OSX)
+
+import Foundation
+
+public typealias NSProcessInfo = ProcessInfo
+
+#endif

Sources/SourceControl/Shims.swift

@@ -0,0 +1,21 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+ -------------------------------------------------------------------------
+
+ Platform-specific shims for the Swift3 transition.
+*/
+
+#if os(OSX)
+
+import Foundation
+
+public typealias NSProcessInfo = ProcessInfo
+
+#endif

Sources/Utility/Shims.swift

@@ -0,0 +1,38 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+ -------------------------------------------------------------------------
+
+ Platform-specific shims for the Swift3 transition.
+*/
+
+#if os(OSX)
+
+import Foundation
+
+public typealias NSFileHandle = FileHandle
+public typealias NSFileManager = FileManager
+public typealias NSJSONSerialization = JSONSerialization
+public typealias NSProcessInfo = ProcessInfo
+
+public let NSUTF8StringEncoding = String.Encoding.utf8
+
+extension NSJSONSerialization {
+    public static func jsonObject(with data: NSData, options: JSONSerialization.ReadingOptions) throws -> AnyObject {
+        return try JSONSerialization.jsonObject(with: data as Data, options: options)
+    }
+}
+
+extension NSFileHandle {
+    public func write(_ data: NSData) {
+        write(data as Data)
+    }
+}
+
+#endif

Sources/swiftpm-xctest-helper/Shims.swift

@@ -0,0 +1,24 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+ -------------------------------------------------------------------------
+
+ Platform-specific shims for the Swift3 transition.
+*/
+
+#if os(OSX)
+
+import Foundation
+
+public typealias NSBundle = Bundle
+public typealias NSFileHandle = FileHandle
+public typealias NSFileManager = FileManager
+public typealias NSJSONSerialization = JSONSerialization
+
+#endif

Tests/Basic/LockTests.swift

@@ -15,7 +15,7 @@ import Basic
 class LockTests: XCTestCase {
     func testBasics() {
         // FIXME: Make this a more interesting test once we have concurrency primitives.
-        var lock = Lock()
+        var lock = Basic.Lock()
         var count = 0
         let N = 100
         for _ in 0..<N {

Tests/Functional/Shims.swift

@@ -0,0 +1,21 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+ -------------------------------------------------------------------------
+
+ Platform-specific shims for the Swift3 transition.
+*/
+
+#if os(OSX)
+
+import Foundation
+
+public typealias NSBundle = Bundle
+
+#endif

Tests/Functional/Utilities.swift

@@ -14,7 +14,7 @@ import POSIX
 import Utility
 
 #if os(OSX)
-import class Foundation.NSBundle
+import class Foundation.Bundle
 #endif
 
 
@@ -107,7 +107,7 @@ enum SwiftPMProduct {
     /// Path to currently built binary.
     var path: String {
       #if os(OSX)
-        for bundle in NSBundle.allBundles() where bundle.bundlePath.hasSuffix(".xctest") {
+        for bundle in Bundle.allBundles() where bundle.bundlePath.hasSuffix(".xctest") {
             return Path.join(bundle.bundlePath.parentDirectory, exec)
         }
         fatalError()