Fix dependencies

AckeeCZ · Jan 11, 2019 · 780cc03 · 780cc03
1 parent 0d9036c
commit 780cc03
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/ACKReactiveExtensions.podspec b/ACKReactiveExtensions.podspec
@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
   s.author           = { 'Ackee' => '[email protected]' }
   s.source           = { :git => 'https://github.com/AckeeCZ/ACKReactiveExtensions.git', :tag => s.version.to_s }
   s.ios.deployment_target = '8.3'
-  s.swift_version = '4.2'
-  s.default_subspec = 'Core','UIKit'
+  s.swift_version    = '4.2'
+  s.default_subspec  = 'Core','UIKit'
   s.dependency 'ReactiveCocoa', '~> 8.0'
 
   s.subspec 'Core' do |core|

diff --git a/ACKReactiveExtensions/Marshal/MarshalMapping.swift b/ACKReactiveExtensions/Marshal/MarshalMapping.swift
@@ -42,7 +42,7 @@ extension Signal where Value == Any, Error: MarshalErrorCreatable {
      */
     public func mapResponse<Model>(forKey key: KeyType? = nil) -> Signal<Model, Error> where Model: Unmarshaling {
         return attemptMap { json in
-            Result {
+            Result(catching: {
                 if ACKReactiveExtensionsConfiguration.allowMappingOnMainThread == false {
                     assert(Thread.current.isMainThread == false, "Mapping should not be performed on main thread!")
                 }
@@ -56,7 +56,7 @@ extension Signal where Value == Any, Error: MarshalErrorCreatable {
                 } else {
                     return try Model.init(object: marshaledJSON)
                 }
-                }
+            })
                 .mapError { Error.createMarshalError($0) }
         }
     }
@@ -68,7 +68,7 @@ extension Signal where Value == Any, Error: MarshalErrorCreatable {
      */
     public func mapResponse<Model>(forKey key: KeyType? = nil) -> Signal<[Model], Error> where Model: Unmarshaling {
         return signal.attemptMap { json in
-            Result {
+            Result(catching: {
                 if ACKReactiveExtensionsConfiguration.allowMappingOnMainThread == false {
                     assert(Thread.current.isMainThread == false, "Mapping should not be performed on main thread!")
                 }
@@ -82,7 +82,7 @@ extension Signal where Value == Any, Error: MarshalErrorCreatable {
                 else {
                     throw MarshalError.typeMismatch(expected: MarshaledObject.self, actual: type(of: json))
                 }
-                }
+            })
                 .mapError { Error.createMarshalError($0) }
         }
     }
@@ -94,7 +94,7 @@ extension Signal where Value == Any, Error: MarshalErrorCreatable {
      */
     public func mapResponse<Model>(forKey key: KeyType) -> Signal<Model, Error> where Model: ValueType {
         return signal.attemptMap { json in
-            Result {
+            Result(catching: {
                 if ACKReactiveExtensionsConfiguration.allowMappingOnMainThread == false {
                     assert(Thread.current.isMainThread == false, "Mapping should not be performed on main thread!")
                 }
@@ -104,7 +104,7 @@ extension Signal where Value == Any, Error: MarshalErrorCreatable {
                         throw MarshalError.typeMismatch(expected: MarshaledObject.self, actual: type(of: json))
                 }
                 return try marshaledJSON.value(for: key)
-                }
+            })
                 .mapError { Error.createMarshalError($0) }
         }
     }

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,7 +1,7 @@
-github "Alamofire/Alamofire" "4.7.3"
-github "Alamofire/AlamofireImage" "3.4.1"
+github "Alamofire/Alamofire" "4.8.0"
+github "Alamofire/AlamofireImage" "3.5.0"
 github "ReactiveCocoa/ReactiveCocoa" "8.0.2"
 github "ReactiveCocoa/ReactiveSwift" "4.0.0"
-github "antitypical/Result" "4.0.0"
-github "realm/realm-cocoa" "v3.11.1"
+github "antitypical/Result" "4.1.0"
+github "realm/realm-cocoa" "v3.13.1"
 github "utahiosmac/Marshal" "1.2.7"