[General] Update for RxSwift & ReactiveSwift

DroidsOnRoids · Nov 10, 2016 · 6c46fe3 · 6c46fe3
1 parent 4eed7c9
commit 6c46fe3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
   Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
   JASON: cf4d762e61428a20db8eaef2acb6a569a10c1801
   Moya: bad6f72ec40661f09a8cd85ab470226d2795a485
-  Moya-JASON: 70e10d4d45367a715a1629105bb8048a7e3b02c2
+  Moya-JASON: 5900f09bcf1114f07bca5d45f2f7d9e29009219b
   Result: 1b3e431f37cbcd3ad89c6aa9ab0ae55515fae3b6
 
 PODFILE CHECKSUM: 9e73af95c0fc56a4a5804903becc9ff90d190bb6

diff --git a/Example/Pods/Local Podspecs/Moya-JASON.podspec.json b/Example/Pods/Local Podspecs/Moya-JASON.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Moya-JASON.podspec b/Moya-JASON.podspec
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
 
   s.subspec "ReactiveCocoa" do |ss|
     ss.source_files = "Source/ReactiveCocoa/*.swift"
-    ss.dependency "Moya/ReactiveCocoa", "8.0.0-alpha.4"
+    ss.dependency "Moya/ReactiveCocoa", "8.0.0-beta.4"
     ss.dependency "Moya-JASON/Core"
     ss.dependency "ReactiveSwift", "1.0.0-alpha.3"
   end

diff --git a/Source/ReactiveCocoa/SignalProducer+ModelMapper.swift b/Source/ReactiveCocoa/SignalProducer+ModelMapper.swift
@@ -6,17 +6,17 @@
 //  Copyright (c) 2016 Droids On Roids. All rights reserved.
 //
 
-import ReactiveCocoa
+import ReactiveSwift
 import Moya
 import JASON
 
 /// Extension for processing Responses into Mappable objects through ObjectMapper
-extension SignalProducerType where Value == Moya.Response, Error == Moya.Error {
+extension SignalProducerProtocol where Value == Moya.Response, Error == Moya.Error {
 
     /// Maps data received from the signal into an object which implements the Mappable protocol.
     /// If the conversion fails, the signal errors.
     public func mapObject<T: Mappable>(type: T.Type, keyPath: [Any] = []) -> SignalProducer<T, Error> {
-        return producer.flatMap(.Latest) { response -> SignalProducer<T, Error> in
+        return producer.flatMap(.latest) { response -> SignalProducer<T, Error> in
             return unwrapThrowable { try response.mapObject(withKeyPath: keyPath) }
         }
     }
@@ -25,7 +25,7 @@ extension SignalProducerType where Value == Moya.Response, Error == Moya.Error {
     /// protocol.
     /// If the conversion fails, the signal errors.
     public func mapArray<T: Mappable>(type: T.Type, keyPath: [Any] = []) -> SignalProducer<[T], Error> {
-        return producer.flatMap(.Latest) { response -> SignalProducer<[T], Error> in
+        return producer.flatMap(.latest) { response -> SignalProducer<[T], Error> in
             return unwrapThrowable { try response.mapArray(withKeyPath: keyPath) }
         }
     }

diff --git a/Source/RxSwift/Observable+ModelMapper.swift b/Source/RxSwift/Observable+ModelMapper.swift
@@ -18,7 +18,7 @@ public extension ObservableType where E == Response {
     /// implements the Mappable protocol and returns the result back on the MainScheduler.
     /// If the conversion fails, the signal errors.
     public func mapObject<T: Mappable>(type: T.Type, keyPath: [Any] = []) -> Observable<T> {
-        return observeOn(SerialDispatchQueueScheduler(globalConcurrentQueueQOS: .Background))
+        return observeOn(SerialDispatchQueueScheduler(qos: .background))
             .flatMap { response -> Observable<T> in
                 return Observable.just(try response.mapObject(withKeyPath: keyPath))
             }
@@ -29,7 +29,7 @@ public extension ObservableType where E == Response {
     /// which implement the Mappable protocol and returns the result back on the MainScheduler
     /// If the conversion fails, the signal errors.
     public func mapArray<T: Mappable>(type: T.Type, keyPath: [Any] = []) -> Observable<[T]> {
-        return observeOn(SerialDispatchQueueScheduler(globalConcurrentQueueQOS: .Background))
+        return observeOn(SerialDispatchQueueScheduler(qos: .background))
             .flatMap { response -> Observable<[T]> in
                 return Observable.just(try response.mapArray(withKeyPath: keyPath))
             }