diff --git a/Cartfile b/Cartfile index 320429136..a97427c31 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "Alamofire/Alamofire" ~> 5.0 -github "ReactiveCocoa/ReactiveSwift" ~> 6.0 -github "ReactiveX/RxSwift" ~> 6.0 +github "Alamofire/Alamofire" ~> 5.4.3 +github "ReactiveCocoa/ReactiveSwift" ~> 6.6.1 +github "ReactiveX/RxSwift" ~> 6.2.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 50893b65b..5f064bafb 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "Alamofire/Alamofire" "5.4.3" +github "AliSoftware/OHHTTPStubs" "9.1.0" +github "Quick/Nimble" "v9.2.1" +github "Quick/Quick" "v4.0.0" github "ReactiveCocoa/ReactiveSwift" "6.6.1" github "ReactiveX/RxSwift" "6.2.0" -github "AliSoftware/OHHTTPStubs" "9.1.0" -github "Quick/Nimble" "v9.2.0" -github "Quick/Quick" "v4.0.0" \ No newline at end of file diff --git a/Moya.podspec b/Moya.podspec index 5e6edb43e..203fc0f0d 100644 --- a/Moya.podspec +++ b/Moya.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| s.subspec "ReactiveSwift" do |ss| ss.source_files = "Sources/ReactiveMoya/" ss.dependency "Moya/Core" - ss.dependency "ReactiveSwift", "~> 6.0" + ss.dependency "ReactiveSwift", "~> 6.6.1" end s.subspec "RxSwift" do |ss| diff --git a/Package.resolved b/Package.resolved index 035c3e5fc..52f494268 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/Alamofire/Alamofire.git", "state": { "branch": null, - "revision": "0c8cb78d05b6d067ee331c05058ff4dedcb45ffa", - "version": "5.0.0" + "revision": "f96b619bcb2383b43d898402283924b80e2c4bae", + "version": "5.4.3" } }, { @@ -75,11 +75,11 @@ }, { "package": "ReactiveSwift", - "repositoryURL": "https://github.com/Moya/ReactiveSwift.git", + "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git", "state": { "branch": null, - "revision": "f195d82bb30e412e70446e2b4a77e1b514099e88", - "version": "6.1.0" + "revision": "2c06e9421011a1a4cf57ea4bbcd8936843a6c9da", + "version": "6.6.1" } }, { @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/shibapm/Rocket", "state": { "branch": null, - "revision": "61166b38e229e09b53becef2e495eb99f437438a", - "version": "1.0.1" + "revision": "51a77ce5fa66c42715c14dcc542c01cd7a60fb27", + "version": "1.2.0" } }, { @@ -105,8 +105,8 @@ "repositoryURL": "https://github.com/kareman/SwiftShell", "state": { "branch": null, - "revision": "fb7fc2c9ad8811caf324431a508fb79e3fb74f99", - "version": "5.0.1" + "revision": "a6014fe94c3dbff0ad500e8da4f251a5d336530b", + "version": "5.1.0-beta.1" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/jpsim/Yams", "state": { "branch": null, - "revision": "c947a306d2e80ecb2c0859047b35c73b8e1ca27f", - "version": "2.0.0" + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" } } ] diff --git a/Package.swift b/Package.swift index 32ecd4525..5d35568d9 100644 --- a/Package.swift +++ b/Package.swift @@ -6,7 +6,7 @@ let rocketIfNeeded: [Package.Dependency] #if os(OSX) || os(Linux) rocketIfNeeded = [ - .package(url: "https://github.com/shibapm/Rocket", .upToNextMajor(from: "1.0.0")) // dev + .package(url: "https://github.com/shibapm/Rocket", .upToNextMajor(from: "1.2.0")) // dev ] #else rocketIfNeeded = [] @@ -27,9 +27,9 @@ let package = Package( .library(name: "RxMoya", targets: ["RxMoya"]) ], dependencies: [ - .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.0.0")), - .package(url: "https://github.com/Moya/ReactiveSwift.git", .upToNextMajor(from: "6.1.0")), - .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")), + .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.4.3")), + .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "6.6.1")), + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.2.0")), .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "4.0.0")), // dev .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.2.0")), // dev .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", .upToNextMajor(from: "9.0.0")) // dev