From cae280103ba5c69b0d5df9391cae0be67d743a1f Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Mon, 24 Jul 2017 20:32:14 +0900 Subject: [PATCH] Update ReactiveSwift to 2.0 --- .travis.yml | 2 -- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/ReactiveSwift | 2 +- Package.pins | 2 +- Package.swift | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index cad318f..a3b5009 100644 --- 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 index 6b778b3..22b7809 100644 --- 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 index 8fb45c2..df14250 100644 --- 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 index c4ca098..6147571 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit c4ca0982a23f5176e2a0b466aa3628647ead0b5c +Subproject commit 614757120eb91a59a7421ad11c48614ca9ac04c0 diff --git a/Package.pins b/Package.pins index 29ff4a4..786b8ed 100644 --- 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 index fd4083d..8116972 100644 --- 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)..