Merge branch 'mattprowse-swift-2.2'

ikesyo · ikesyo · commit 8502e5bd7284 · 2016-03-31T13:58:57.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 xcode_workspace: ReactiveTask.xcworkspace
 xcode_scheme: ReactiveTask
 script: script/cibuild
@@ -9,7 +9,7 @@ notifications:
     secure: Nh1mbn1RzYrI5tIY52gNrMy+PX1hdq2rIAJHxJjeiWjQDYfIoynhQ/2NIKs6Y0b0E5GIQEtF1fereyWdxcoEFGloY3cq4HZ7dgqr9kzOHrlDMp80fWbcoTqrgbOsKreFFtrv413d5+YcNkJvkYRfnxbuWLPZPszrcbw82TyRL60=
 before_deploy:
   - brew update
-  - brew install carthage
+  - brew outdated carthage || brew upgrade carthage
   - carthage build --no-skip-current
   - carthage archive ReactiveTask
 deploy:
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 4.0
+github "ReactiveCocoa/ReactiveCocoa" ~> 4.1
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.9
-github "Quick/Nimble" ~> 3.0
-github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
+github "Quick/Quick" "3a1d88f"
+github "Quick/Nimble" ~> 3.2
+github "jspahrsummers/xcconfigs" ~> 0.9
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v3.1.0"
-github "Quick/Quick" "v0.9.1"
-github "antitypical/Result" "1.0.1"
-github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0"
+github "Quick/Nimble" "v3.2.0"
+github "Quick/Quick" "3a1d88fb81476001c62f086dbd94bb0f5354f1a3"
+github "antitypical/Result" "2.0.0"
+github "jspahrsummers/xcconfigs" "0.9"
+github "ReactiveCocoa/ReactiveCocoa" "v4.1.0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 72878d6622cf8362d3507cd2e3d341b06580f451
+Subproject commit 3f3ae0ebd210ed563ce75e313f1b6022188eb660
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 2f037560be197f0f5ae992512549bc29fabb3818
+Subproject commit 3a1d88fb81476001c62f086dbd94bb0f5354f1a3
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
@@ -1 +1 @@
-Subproject commit a9b1c892a328e48d4533d16cd4263aea0bf8d4f4
+Subproject commit fdbd3676cc4305c48e53bc25aebdb0eb607cdc2b
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 9f2c108adeb7427782d69381e2414f7175b373cc
+Subproject commit 5dec9cf225d5fa3b0602679fb2638e40191da46b
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit ec5753493605deed7358dec5f9260f503d3ed650
+Subproject commit d78854b22b9567e7f30d748bdd4966c86bcc93a5
diff --git a/ReactiveTask/Task.swift b/ReactiveTask/Task.swift
@@ -232,7 +232,7 @@ private final class Pipe {
 
 public protocol TaskEventType {
 	/// The type of value embedded in a `Success` event.
-	typealias T
+	associatedtype T
 
 	/// The resulting value, if the event is `Success`.
 	var value: T? { get }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveCocoa" ~> 4.0`
	`1`	`+github "ReactiveCocoa/ReactiveCocoa" ~> 4.1`