Swift 3 Support

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "Carthage/Checkouts/Nimble"]
 	path = Carthage/Checkouts/Nimble
-	url = https://github.com/Quick/Nimble.git
+	url = https://github.com/andersio/Nimble.git
 [submodule "Carthage/Checkouts/Quick"]
 	path = Carthage/Checkouts/Quick
-	url = https://github.com/Quick/Quick.git
+	url = https://github.com/norio-nomura/Quick.git
 [submodule "Carthage/Checkouts/Result"]
 	path = Carthage/Checkouts/Result
-	url = https://github.com/antitypical/Result.git
+	url = https://github.com/jameshurst/Result.git
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git

.travis.yml

@@ -33,4 +33,4 @@ deploy:
   on:
     repo: Carthage/ReactiveTask
     tags: true
-    condition: $JOB = Xcode7.3
+    condition: $JOB = Xcode8

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.2
+github "ReactiveCocoa/ReactiveCocoa" "RAC5"

Cartfile.private

@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.9.3
-github "Quick/Nimble" "188caeb"
+github "norio-nomura/Quick" "nn-swift-3-compatibility"
+github "andersio/Nimble" "swift3-beta-4"
 github "jspahrsummers/xcconfigs" "1ef9763"

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "Quick/Nimble" "188caeb094bc342614d8a5c706cd8bb9a6c355eb"
-github "Quick/Quick" "v0.9.3"
-github "antitypical/Result" "2.1.3"
+github "andersio/Nimble" "7c0762319cd5c902a85b92722a0659cc33cd6338"
+github "norio-nomura/Quick" "eaf60d980d88ffefd8c3a7515f53547453d5938b"
+github "jameshurst/Result" "2401fa7584183da17f40335816073bf511fb34b8"
 github "jspahrsummers/xcconfigs" "1ef97639ffbe041da0b1392b2114fa19b922a7a1"
-github "ReactiveCocoa/ReactiveCocoa" "v4.2.2"
+github "ReactiveCocoa/ReactiveCocoa" "b4d757433574f85519bb3253a631955da937106a"

ReactiveTask.xcodeproj/project.pbxproj

@@ -269,7 +269,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = Carthage;
 				TargetAttributes = {
 					D0BFEA571A2D1E5E00E23194 = {
@@ -350,10 +350,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0BFEA781A2D1E7C00E23194 /* Debug.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_VERSION = 2.3;
@@ -366,9 +368,11 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0BFEA7A1A2D1E7C00E23194 /* Release.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SDKROOT = macosx;
 				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -386,6 +390,7 @@
 				INFOPLIST_FILE = ReactiveTask/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -399,6 +404,7 @@
 				INFOPLIST_FILE = ReactiveTask/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -413,6 +419,7 @@
 				INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -427,16 +434,19 @@
 				INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 		D0BFEA991A2D1F8B00E23194 /* Test */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0BFEA7B1A2D1E7C00E23194 /* Test.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SDKROOT = macosx;
 				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -454,6 +464,7 @@
 				INFOPLIST_FILE = ReactiveTask/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Test;
 		};
@@ -468,16 +479,19 @@
 				INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Test;
 		};
 		D0BFEA9C1A2D1F8E00E23194 /* Profile */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0BFEA791A2D1E7C00E23194 /* Profile.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SDKROOT = macosx;
 				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -495,6 +509,7 @@
 				INFOPLIST_FILE = ReactiveTask/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Profile;
 		};
@@ -509,6 +524,7 @@
 				INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Profile;
 		};

ReactiveTask.xcodeproj/xcshareddata/xcschemes/ReactiveTask.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ReactiveTask/Errors.swift

@@ -10,37 +10,37 @@ import Foundation
 import ReactiveCocoa
 
 /// An error originating from ReactiveTask.
-public enum TaskError: ErrorType, Equatable {
+public enum TaskError: Error, Equatable {
 	/// A shell task exited unsuccessfully.
-	case ShellTaskFailed(Task, exitCode: Int32, standardError: String?)
+	case shellTaskFailed(Task, exitCode: Int32, standardError: String?)
 
 	/// An error was returned from a POSIX API.
-	case POSIXError(Int32)
+	case posixError(Int32)
 }
 
 extension TaskError: CustomStringConvertible {
 	public var description: String {
 		switch self {
-		case let .ShellTaskFailed(task, exitCode, standardError):
+		case let .shellTaskFailed(task, exitCode, standardError):
 			var description = "A shell task (\(task)) failed with exit code \(exitCode)"
 			if let standardError = standardError {
 				description += ":\n\(standardError)"
 			}
 
 			return description
 
-		case let .POSIXError(code):
+		case let .posixError(code):
 			return NSError(domain: NSPOSIXErrorDomain, code: Int(code), userInfo: nil).description
 		}
 	}
 }
 
 public func == (lhs: TaskError, rhs: TaskError) -> Bool {
 	switch (lhs, rhs) {
-	case let (.ShellTaskFailed(lhsTask, lhsCode, lhsErr), .ShellTaskFailed(rhsTask, rhsCode, rhsErr)):
+	case let (.shellTaskFailed(lhsTask, lhsCode, lhsErr), .shellTaskFailed(rhsTask, rhsCode, rhsErr)):
 		return lhsTask == rhsTask && lhsCode == rhsCode && lhsErr == rhsErr
 
-	case let (.POSIXError(lhsCode), .POSIXError(rhsCode)):
+	case let (.posixError(lhsCode), .posixError(rhsCode)):
 		return lhsCode == rhsCode
 
 	default: