Update ReactiveSwift to 2.0

ikesyo · ikesyo · commit cae280103ba5 · 2017-07-24T20:32:14.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,6 @@ matrix:
     - os: osx
       osx_image: xcode8.3
       script:
-        - swift package fetch
-        - swift package edit ReactiveSwift --revision 2.0.0-rc.3
         - swift build
         - SWIFTPM_TEST_ReactiveTask=YES swift test
       git:
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 github "antitypical/Result" ~> 3.2.1
-github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.3"
+github "ReactiveCocoa/ReactiveSwift" ~> 2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v7.0.1"
 github "Quick/Quick" "v1.1.0"
-github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.3"
+github "ReactiveCocoa/ReactiveSwift" "2.0.0"
 github "antitypical/Result" "3.2.3"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit c4ca0982a23f5176e2a0b466aa3628647ead0b5c
+Subproject commit 614757120eb91a59a7421ad11c48614ca9ac04c0
diff --git a/Package.pins b/Package.pins
@@ -17,7 +17,7 @@
       "package": "ReactiveSwift",
       "reason": null,
       "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
-      "version": "1.1.3"
+      "version": "2.0.0"
     },
     {
       "package": "Result",
diff --git a/Package.swift b/Package.swift
@@ -10,7 +10,7 @@ let package = Package(
     dependencies: {
         var deps: [Package.Dependency] = [
             .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
-            .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
+            .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 2),
         ]
         if isSwiftPackagerManagerTest {
             deps += [

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`github "antitypical/Result" ~> 3.2.1`
`2`		`-github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.3"`
	`2`	`+github "ReactiveCocoa/ReactiveSwift" ~> 2.0`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"package": "ReactiveSwift",`
`18`	`18`	`"reason": null,`
`19`	`19`	`"repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",`
`20`		`- "version": "1.1.3"`
	`20`	`+ "version": "2.0.0"`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"package": "Result",`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ let package = Package(`
`10`	`10`	`dependencies: {`
`11`	`11`	`var deps: [Package.Dependency] = [`
`12`	`12`	`.Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),`
`13`		`- .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),`
	`13`	`+ .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 2),`
`14`	`14`	`]`
`15`	`15`	`if isSwiftPackagerManagerTest {`
`16`	`16`	`deps += [`