Merge pull request #99 from Carthage/ras2-final

Update ReactiveSwift to 2.0
Carthage · Jul 24, 2017 · 275f897 · 275f897
2 parents e457822 + cae2801
commit 275f897
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
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
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 += [
+18 −0		.travis.yml
+1 −0		CHANGELOG.md
+1 −1		Documentation/APIContracts.md
+1 −1		Documentation/ReactivePrimitives.md
+3 −18		README.md
+1 −1		ReactiveSwift.podspec
+2 −2		Sources/FoundationExtensions.swift
+3 −1		Sources/Signal.swift
+2 −2		Tests/ReactiveSwiftTests/FoundationExtensionsSpec.swift