Merge pull request #39 from typelift/swift-develop

Update to Swift 3.0

Author: CodaFi

.gitignore

@@ -1,5 +1,6 @@
 # Xcode
 .DS_Store
+.build/*
 build/
 *.pbxuser
 !default.pbxuser

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode7.3
+      osx_image: xcode8
       before_install:
         - git submodule update --init --recursive
       script:
@@ -14,15 +14,15 @@ matrix:
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode7.3
+      osx_image: xcode8
       before_install:
         - git submodule update --init --recursive
       script:
         - set -o pipefail
         - xcodebuild test -scheme Concurrent | xcpretty -c
         # !!!: Make sure desired device name & OS version are suitable for the Xcode version installed on osx_image
-        - iOS_DEVICE_NAME="iPad Pro"
-        - iOS_RUNTIME_VERSION="9.3"
+        - iOS_DEVICE_NAME="iPad Pro (12.9 inch)"
+        - iOS_RUNTIME_VERSION="10.0"
         # Get simulator identifier for desired device/runtime pair
         - SIMULATOR_ID=$(xcrun instruments -s | grep -o "${iOS_DEVICE_NAME} (${iOS_RUNTIME_VERSION}) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
         - echo $SIMULATOR_ID
@@ -37,12 +37,11 @@ matrix:
       before_install:
         - git submodule update --init --recursive
         - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
-        - wget https://swift.org/builds/swift-2.2.1-release/ubuntu1404/swift-2.2.1-RELEASE/swift-2.2.1-RELEASE-ubuntu14.04.tar.gz
-        - tar xzf swift-2.2.1-RELEASE-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-2.2.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
+        - wget https://swift.org/builds/swift-3.0-release/ubuntu1404/swift-3.0-RELEASE/swift-3.0-RELEASE-ubuntu14.04.tar.gz
+        - tar xzf swift-3.0-RELEASE-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-3.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}" 
       script:
-        # Uncomment when releasing Swift 3.0
-        # - swift build
+        - swift build
 notifications:
   webhooks:
     urls:

Cartfile.private

@@ -1 +1 @@
-github "typelift/SwiftCheck" 
+github "typelift/SwiftCheck"

Cartfile.resolved

@@ -1 +1 @@
-github "typelift/SwiftCheck" "v0.6.2"
+github "typelift/SwiftCheck" "v0.7.0"

Carthage/Checkouts/SwiftCheck

@@ -0,0 +1,11 @@
+import PackageDescription
+
+let package = Package(
+  name: "Concurrent",
+  targets: [
+    Target(
+      name: "Concurrent",
+      dependencies: []),
+  ]
+)
+

Concurrent.xcodeproj/project.pbxproj

@@ -6,11 +6,11 @@
 //  Copyright (c) 2014 TypeLift. All rights reserved.
 //
 
-/// Channels are unbounded FIFO streams of values with a read and write terminals comprised of
-/// MVars.
+/// Channels are unbounded FIFO streams of values with a read and write 
+/// terminals comprised of `MVar`s.
 public struct Chan<A> {
-	let readEnd : MVar<MVar<ChItem<A>>>
-	let writeEnd : MVar<MVar<ChItem<A>>>
+	fileprivate let readEnd : MVar<MVar<ChItem<A>>>
+	fileprivate let writeEnd : MVar<MVar<ChItem<A>>>
 
 	private init(read : MVar<MVar<ChItem<A>>>, write: MVar<MVar<ChItem<A>>>) {
 		self.readEnd = read
@@ -40,7 +40,7 @@ public struct Chan<A> {
 	}
 
 	/// Writes a value to a channel.
-	public func write(x : A) {
+	public func write(_ x : A) {
 		self.writeEnd.modify_ { old_hole in
 			let new_hole : MVar<ChItem<A>> = MVar()
 			old_hole.put(ChItem(x, new_hole))
@@ -49,7 +49,7 @@ public struct Chan<A> {
 	}
 
 	/// Writes a list of values to a channel.
-	public func writeList(xs : [A]) {
+	public func writeList(_ xs : [A]) {
 		xs.forEach(self.write)
 	}
 
@@ -91,11 +91,11 @@ public struct Chan<A> {
 	}
 }
 
-internal struct ChItem<A> {
+private struct ChItem<A> {
 	let val : () -> A
 	let stream : () -> MVar<ChItem<A>>
 
-	init(@autoclosure(escaping) _ val : () -> A, @autoclosure(escaping) _ stream :  () -> MVar<ChItem<A>>) {
+	init(_ val : @autoclosure @escaping () -> A, _ stream :  @autoclosure @escaping () -> MVar<ChItem<A>>) {
 		self.val = val
 		self.stream = stream
 	}