Version 2.4

bmoliveira · Sep 11, 2017 · ee75721 · ee75721
1 parent b78ed79
commit ee75721
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/Moya-ObjectMapper.podspec b/Moya-ObjectMapper.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Moya-ObjectMapper"
-  s.version      = "2.3.2"
+  s.version      = "2.4"
   s.summary      = "ObjectMapper bindings for Moya"
   s.description  = <<-EOS
   [ObjectMapper](https://github.com/Hearst-DD/ObjectMapper) bindings for
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
 
   s.subspec "Core" do |ss|
     ss.source_files  = "Source/*.swift"
-    ss.dependency "Moya", '~> 9.0'
+    ss.dependency "Moya", '~> 8.0'
     ss.dependency "ObjectMapper", '~> 2.2'
     ss.framework  = "Foundation"
   end
@@ -31,13 +31,14 @@ Pod::Spec.new do |s|
     ss.source_files = "Source/RxSwift/*.swift"
     ss.dependency "Moya/RxSwift"
     ss.dependency "Moya-ObjectMapper/Core"
-    ss.dependency "RxSwift", '~> 3.1'
+    ss.dependency "RxSwift", '~> 3.3'
   end
 
   s.subspec "ReactiveSwift" do |ss|
     ss.source_files = "Source/ReactiveSwift/*.swift"
-    ss.dependency "Moya/ReactiveSwift"
-    ss.dependency "Moya-ObjectMapper/Core"
-    ss.dependency "ReactiveSwift"
-  end
+     ss.dependency "Moya/ReactiveSwift"
+     ss.dependency "Moya-ObjectMapper/Core"
+     ss.dependency "ReactiveSwift"
+   end
+
 end
diff --git a/Source/ReactiveSwift/SignalProducer+ObjectMapper.swift b/Source/ReactiveSwift/SignalProducer+ObjectMapper.swift
@@ -7,7 +7,7 @@ extension SignalProducerProtocol where Value == Moya.Response, Error == MoyaErro
 
     /// 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:BaseMappable>(_ type: T.Type, context: MapContext? = nil) -> SignalProducer<T, MoyaError> {
+    public func mapObject<T: BaseMappable>(_ type: T.Type, context: MapContext? = nil) -> SignalProducer<T, MoyaError> {
         return producer.flatMap(.latest) {
             (response: Response) -> SignalProducer<T, Error> in
             return unwrapThrowable { try response.mapObject(type, context: context) }
@@ -17,7 +17,7 @@ extension SignalProducerProtocol where Value == Moya.Response, Error == MoyaErro
     /// Maps data received from the signal into an array of objects which implement the Mappable
     /// protocol.
     /// If the conversion fails, the signal errors.
-    public func mapArray<T:BaseMappable>(_ type: T.Type, context: MapContext? = nil) -> SignalProducer<[T], MoyaError> {
+    public func mapArray<T: BaseMappable>(_ type: T.Type, context: MapContext? = nil) -> SignalProducer<[T], MoyaError> {
         return producer.flatMap(.latest) { (response: Response) -> SignalProducer<[T], Error> in
             return unwrapThrowable { try response.mapArray(type, context: context) }
         }

diff --git a/Source/Response+ObjectMapper.swift b/Source/Response+ObjectMapper.swift
@@ -41,7 +41,7 @@ public extension Response {
   /// protocol.
   /// If the conversion fails, the signal errors.
   public func mapObject<T: ImmutableMappable>(_ type: T.Type, context: MapContext? = nil) throws -> T {
-	return try Mapper<T>(context: context).map(JSONObject: try mapJSON())
+		return try Mapper<T>(context: context).map(JSONObject: try mapJSON())
   }
 
   /// Maps data received from the signal into an array of objects which implement the ImmutableMappable
@@ -51,7 +51,7 @@ public extension Response {
     guard let array = try mapJSON() as? [[String : Any]] else {
       throw MoyaError.jsonMapping(self)
     }
-	return try Mapper<T>(context: context).mapArray(JSONArray: array)
+		return try Mapper<T>(context: context).mapArray(JSONArray: array)
   }
 
 }