Merge pull request Moya#1849 from Moya/feature/reactiveswift_6.0

ReactiveSwift 6.0
KazanExpress · May 2, 2019 · 28fdf55 · 28fdf55
2 parents 341b987 + 0d90831
commit 28fdf55
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
 github "Alamofire/Alamofire" ~> 4.1
-github "ReactiveCocoa/ReactiveSwift" ~> 5.0
+github "ReactiveCocoa/ReactiveSwift" ~> 6.0
 github "ReactiveX/RxSwift" ~> 5.0
 github "antitypical/Result" ~> 4.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -2,6 +2,6 @@ github "Alamofire/Alamofire" "4.8.2"
 github "AliSoftware/OHHTTPStubs" "7.0.0"
 github "Quick/Nimble" "v8.0.1"
 github "Quick/Quick" "v2.1.0"
-github "ReactiveCocoa/ReactiveSwift" "5.0.1"
+github "ReactiveCocoa/ReactiveSwift" "6.0.0"
 github "ReactiveX/RxSwift" "5.0.1"
 github "antitypical/Result" "4.1.0"
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,7 @@
 
 ### Changed
 - **Breaking Change** Minimum version of `RxSwift` is now 5.0. [#1846](https://github.com/Moya/Moya/pull/1846) by [@LucianoPAlmeida](https://github.com/LucianoPAlmeida).
+- **Breaking Change** Minimum version of `ReactiveSwift` is now 6.0. [#1849](https://github.com/Moya/Moya/pull/1849) by [@sunshinejr](https://github.com/sunshinejr).
 
 # [13.0.1] - 2019-05-01
 

diff --git a/Moya.podspec b/Moya.podspec
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
   s.subspec "ReactiveSwift" do |ss|
     ss.source_files = "Sources/ReactiveMoya/"
     ss.dependency "Moya/Core"
-    ss.dependency "ReactiveSwift", "~> 5.0"
+    ss.dependency "ReactiveSwift", "~> 6.0"
   end
 
   s.subspec "RxSwift" do |ss|

diff --git a/Package.resolved b/Package.resolved
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
         "state": {
           "branch": null,
-          "revision": "c37950dc5020544c58d4bf47c0d028893686b9e6",
-          "version": "5.0.1"
+          "revision": "3eba2b48ee80f87058de5ae8bb41e585bde5c997",
+          "version": "6.0.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ 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.1.0")),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: ("5.0.0"))),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: ("6.0.0"))),
         .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0"))
     ],
     targets: [