Merge pull request #61 from CodaFi/upper-crust

Update to Swift 3.1

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode8
+      osx_image: xcode8.3
       before_install:
         - git submodule update --init --recursive
       script:
@@ -14,7 +14,7 @@ matrix:
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode8
+      osx_image: xcode8.3
       before_install:
         - git submodule update --init --recursive
       script:
@@ -41,9 +41,9 @@ 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-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}"
+        - wget https://swift.org/builds/swift-3.1-release/ubuntu1404/swift-3.1-RELEASE/swift-3.1-RELEASE-ubuntu14.04.tar.gz
+        - tar xzf swift-3.1-RELEASE-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-3.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
       script:
         - swift build
 notifications:

Cartfile.resolved

@@ -1,2 +1,2 @@
 github "typelift/Operadics" "0.2.2"
-github "typelift/SwiftCheck" "v0.7.0"
+github "typelift/SwiftCheck" "0.8.0"

Swiftx.xcodeproj/project.pbxproj

@@ -264,7 +264,10 @@
 				84A88D2E1A70BF0A003D53CF /* SwiftxTests */,
 				84A88C8A1A70BD71003D53CF /* Products */,
 			);
+			indentWidth = 4;
 			sourceTree = "<group>";
+			tabWidth = 4;
+			usesTabs = 1;
 		};
 		84A88C8A1A70BD71003D53CF /* Products */ = {
 			isa = PBXGroup;

Tests/LinuxMain.swift

@@ -0,0 +1,17 @@
+//
+//  LinuxMain.swift
+//  SwiftCheck
+//
+//  Created by Robert Widmann on 9/18/16.
+//  Copyright © 2016 Typelift. All rights reserved.
+//
+
+import XCTest
+
+@testable import SwiftxTests
+
+#if !os(macOS)
+XCTMain([
+	EitherSpec.allTests,
+])
+#endif

Tests/SwiftxTests/EitherSpec.swift

@@ -12,10 +12,10 @@ import SwiftCheck
 
 extension Either where L : Arbitrary, R : Arbitrary {
 	static var arbitrary : Gen<Either<L, R>> {
-		return Gen.oneOf([
+		return Gen.one(of: [
 			L.arbitrary.map(Either.Left),
 			R.arbitrary.map(Either.Right),
-		])
+			])
 	}
 
 	static func shrink(_ e : Either<L, R>) -> [Either<L, R>] {
@@ -56,7 +56,7 @@ class EitherSpec : XCTestCase {
 		property("isRight behaves") <- forAllShrink(Either<Int, Int>.arbitrary, shrinker: Either.shrink) { e in
 			return e.isRight == e.fold(false, f: const(true))
 		}
-		
+
 		property("left and right behave") <- forAllShrink(Either<Int, Int>.arbitrary, shrinker: Either.shrink) { e in
 			return (e.isLeft && e.left != nil) || (e.isRight && e.right != nil)
 		}
@@ -85,4 +85,10 @@ class EitherSpec : XCTestCase {
 			}
 		}
 	}
+
+	#if !(os(macOS) || os(iOS) || os(watchOS) || os(tvOS))
+	static var allTests = testCase([
+		("testProperties", testProperties),
+	])
+	#endif
 }