Update RxSwift to rc.0 version and fix SPM syntax

KazanExpress · Oct 21, 2017 · 67794b6 · 67794b6
1 parent 55a6018
commit 67794b6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
 github "Alamofire/Alamofire" ~> 4.1
 github "ReactiveCocoa/ReactiveSwift" ~> 2.0
-github "ReactiveX/RxSwift" "4.0.0-beta.1"
+github "ReactiveX/RxSwift" "4.0.0-rc.0"
 github "antitypical/Result" ~> 3.1
diff --git 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-beta.1"
+github "ReactiveX/RxSwift" "4.0.0-rc.0"
 github "antitypical/Result" "3.2.4"
diff --git a/Moya.podspec b/Moya.podspec
@@ -40,6 +40,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-beta.1"
+    ss.dependency "RxSwift", "4.0.0-rc.0"
   end
 end
diff --git a/Package.resolved b/Package.resolved
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "aacfcc894bd3bc3ea1b03d483720973ea0e02905",
-          "version": "4.0.0-beta.1"
+          "revision": "61261f2ee97ace3e08713921dd9406669b9debee",
+          "version": "4.0.0-rc.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -12,29 +12,36 @@ 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: ["beta", "1"]))),
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .exact(Version(4, 0, 0, prereleaseIdentifiers: ["rc", "0"]))),
     ],
     targets: [
          .target(
             name: "Moya",
             dependencies: [
                 "Alamofire",
-                "Result"]),
+                "Result"],
+            exclude: [
+                "Tests",
+                "Sources/Supporting Files",
+                "Examples"]),
         .target(
             name: "ReactiveMoya",
             dependencies: [
                 "Moya",
-                "ReactiveSwift"]),
+                "ReactiveSwift"],
+            exclude: [
+                "Tests",
+                "Sources/Supporting Files",
+                "Examples"]),
         .target(
             name: "RxMoya",
             dependencies: [
                 "Moya",
-                "RxSwift"]),
-    ],
-    exclude: [
-        "Tests",
-        "Sources/Supporting Files",
-	    "Examples"
+                "RxSwift"],
+            exclude: [
+                "Tests",
+                "Sources/Supporting Files",
+                "Examples"])                
     ],
     swiftLanguageVersions: [3, 4]
 )