diff --git a/Cartfile b/Cartfile index e8a57d137..ee7d3cbfc 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ github "Alamofire/Alamofire" ~> 4.1 -github "ReactiveCocoa/ReactiveSwift" ~> 4.0 +github "ReactiveCocoa/ReactiveSwift" ~> 5.0 github "ReactiveX/RxSwift" ~> 4.0 -github "antitypical/Result" ~> 4.0 +github "antitypical/Result" ~> 4.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index c31e029cc..9ba7ffd8e 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,7 @@ -github "Alamofire/Alamofire" "4.7.3" +github "Alamofire/Alamofire" "4.8.1" github "AliSoftware/OHHTTPStubs" "f90c2bb0fb882e43761ab963ca8869d349d2c6e3" -github "Quick/Nimble" "v7.1.3" -github "Quick/Quick" "v1.3.1" -github "ReactiveCocoa/ReactiveSwift" "4.0.0" -github "ReactiveX/RxSwift" "4.3.1" -github "antitypical/Result" "4.0.0" +github "Quick/Nimble" "v7.3.4" +github "Quick/Quick" "v1.3.4" +github "ReactiveCocoa/ReactiveSwift" "5.0.0" +github "ReactiveX/RxSwift" "4.4.2" +github "antitypical/Result" "4.1.0" diff --git a/Moya.podspec b/Moya.podspec index e97123307..6d29e5985 100644 --- a/Moya.podspec +++ b/Moya.podspec @@ -25,14 +25,14 @@ Pod::Spec.new do |s| s.subspec "Core" do |ss| ss.source_files = "Sources/Moya/", "Sources/Moya/Plugins/" ss.dependency "Alamofire", "~> 4.1" - ss.dependency "Result", "~> 4.0" + ss.dependency "Result", "~> 4.1" ss.framework = "Foundation" end s.subspec "ReactiveSwift" do |ss| ss.source_files = "Sources/ReactiveMoya/" ss.dependency "Moya/Core" - ss.dependency "ReactiveSwift", "~> 4.0" + ss.dependency "ReactiveSwift", "~> 5.0" end s.subspec "RxSwift" do |ss| diff --git a/Package.resolved b/Package.resolved index 4fd4961d8..4d884bc4c 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/Alamofire/Alamofire.git", "state": { "branch": null, - "revision": "61a780f3b58ee0d2bb76fdb7b89dbc9751d521d7", - "version": "4.7.3" + "revision": "d82c7943d80785834da4693b92133012626c060b", + "version": "4.8.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Quick/Nimble.git", "state": { "branch": null, - "revision": "9c1379fdcd58c4f2278aea5e029394ba9a2b8f07", - "version": "7.1.3" + "revision": "43304bf2b1579fd555f2fdd51742771c1e4f2b98", + "version": "8.0.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/Quick/Quick.git", "state": { "branch": null, - "revision": "b060679e70d13c3c7dcd124201b5b1b34ce6f340", - "version": "1.3.1" + "revision": "0b4ed6c706dd0cce923b5019a605a9bcc6b1b600", + "version": "2.0.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git", "state": { "branch": null, - "revision": "4f6a12ae6762e825b0e19a4f7076eafa43847e6e", - "version": "4.0.0" + "revision": "e285cea17cca8e23928d1e85a235638184e39ac9", + "version": "5.0.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/antitypical/Result.git", "state": { "branch": null, - "revision": "8fc088dcf72802801efeecba76ea8fb041fb773d", - "version": "4.0.0" + "revision": "2ca499ba456795616fbc471561ff1d963e6ae160", + "version": "4.1.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", "state": { "branch": null, - "revision": "faeb158ce76d355f3f9242fdd0258a9face62f37", - "version": "4.2.0" + "revision": "fc6030ea9fe9b8af0351fe195b4095a9f2339757", + "version": "4.4.2" } } ] diff --git a/Package.swift b/Package.swift index 1e5fd9560..6183c8b16 100644 --- a/Package.swift +++ b/Package.swift @@ -10,8 +10,8 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "4.1.0")), - .package(url: "https://github.com/antitypical/Result.git", .upToNextMajor(from: "4.0.0")), - .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: ("4.0.0"))), + .package(url: "https://github.com/antitypical/Result.git", .upToNextMajor(from: "4.1.0")), + .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: ("5.0.0"))), .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")) ], targets: [