From fe3372c31cc8f47277e0206d7982018cdfd6e6f7 Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Thu, 19 Oct 2017 14:59:49 +0900 Subject: [PATCH] Update RxSwift dependency to 4.0.0 --- Cartfile | 2 +- Cartfile.resolved | 2 +- Moya.podspec | 2 +- Package.resolved | 4 ++-- Package.swift | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cartfile b/Cartfile index ce2505ec4..f6edc6aa9 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ github "Alamofire/Alamofire" ~> 4.1 github "ReactiveCocoa/ReactiveSwift" ~> 2.0 -github "ReactiveX/RxSwift" "4.0.0-rc.0" +github "ReactiveX/RxSwift" ~> 4.0 github "antitypical/Result" ~> 3.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 989b4b8f4..b80819285 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -3,5 +3,5 @@ github "AliSoftware/OHHTTPStubs" "f90c2bb0fb882e43761ab963ca8869d349d2c6e3" github "Quick/Nimble" "v7.0.2" github "Quick/Quick" "v1.2.0" github "ReactiveCocoa/ReactiveSwift" "2.0.1" -github "ReactiveX/RxSwift" "4.0.0-rc.0" +github "ReactiveX/RxSwift" "4.0.0" github "antitypical/Result" "3.2.4" diff --git a/Moya.podspec b/Moya.podspec index 7fdd0ff23..bb8ac78d6 100644 --- a/Moya.podspec +++ b/Moya.podspec @@ -36,6 +36,6 @@ Pod::Spec.new do |s| s.subspec "RxSwift" do |ss| ss.source_files = "Sources/RxMoya/" ss.dependency "Moya/Core" - ss.dependency "RxSwift", "4.0.0-rc.0" + ss.dependency "RxSwift", "~> 4.0" end end diff --git a/Package.resolved b/Package.resolved index ba9d802ea..4c21f92d1 100644 --- a/Package.resolved +++ b/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", "state": { "branch": null, - "revision": "61261f2ee97ace3e08713921dd9406669b9debee", - "version": "4.0.0-rc.0" + "revision": "12cccb171ad9038251af6883807f0290c1d75a5b", + "version": "4.0.0" } } ] diff --git a/Package.swift b/Package.swift index 0ce77d505..eadde3d5f 100644 --- a/Package.swift +++ b/Package.swift @@ -12,7 +12,7 @@ let package = Package( .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "4.1.0")), .package(url: "https://github.com/antitypical/Result.git", .upToNextMajor(from: "3.0.0")), .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "2.0.0")), - .package(url: "https://github.com/ReactiveX/RxSwift.git", .exact(Version(4, 0, 0, prereleaseIdentifiers: ["rc", "0"]))), + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")), ], targets: [ .target(