Remove NSDictionaryMerge dependency.

KMSClient.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "KMSClient"
-  s.version          = "1.1.1"
+  s.version          = "1.1.2"
   s.summary          = "Kurento Media Server iOS client."
   s.homepage         = "https://github.com/sdkdimon/kms-ios-client"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -14,23 +14,22 @@ Pod::Spec.new do |s|
   s.dependency 'SocketRocket', '0.5.1'
   s.dependency 'MantleNullValuesOmit', '0.0.2'
   s.dependency 'Mantle', '2.1.0'
-  s.dependency 'ReactiveObjC', '2.1.2'
-  s.dependency 'NSDictionaryMerge', '1.0'
+  s.dependency 'ReactiveObjC', '3.0.0'
   s.source_files = 'KMSClient/KMSClient/*.{h,m}'
-  
+
   s.subspec 'ModelLayer' do |ss|
       ss.source_files = 'KMSClient/KMSClient/ModelLayer/*.{h,m}'
       ss.subspec 'Types' do |sss|
         sss.source_files = 'KMSClient/KMSClient/ModelLayer/Types/*.{h,m}'
-      end 
-  end  
+      end
+  end
 
   s.subspec 'MessageFactory' do |ss|
       ss.source_files = 'KMSClient/KMSClient/MessageFactory/*.{h,m}'
       ss.dependency 'KMSClient/ModelLayer'
       ss.dependency 'KMSClient/UUID'
   end
-    
+
   s.subspec 'Log' do |ss|
       ss.source_files = 'KMSClient/KMSClient/Log/*.{h,m}'
   end
@@ -40,6 +39,3 @@ Pod::Spec.new do |s|
   end
 
 end
-
-
-

KMSClient/KMSClient/ModelLayer/KMSEventData.h

@@ -19,7 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "MTLModel.h"
+#import <Mantle/Mantle.h>
+
 #import "KMSEventType.h"
 #import "KMSElementConnection.h"
 #import "KMSICECandidate.h"

KMSClient/KMSClient/ModelLayer/KMSEventData.m

@@ -20,9 +20,6 @@
 // THE SOFTWARE.
 
 #import "KMSEventData.h"
-#import "NSDictionary+Merge.h"
-#import <Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h>
-
 
 @implementation KMSEventData
 
@@ -72,7 +69,7 @@ + (NSValueTransformer *)typeJSONTransformer{
 @implementation KMSEventDataICECandidate
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:  @{@"candidate" : @"candidate"}];
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:  @{@"candidate" : @"candidate"}];
 }
 
 + (NSValueTransformer *)candidateJSONTransformer{
@@ -99,7 +96,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionaryValue error:(NSErro
 }
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"sink" : @"sink",
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"sink" : @"sink",
                                                                               @"mediaType" : @"mediaType"}];
 }
 
@@ -115,7 +112,7 @@ + (NSValueTransformer *)mediaTypeJSONTransformer{
 @implementation KMSEventDataMediaStateChanged
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"state" : @"newState",
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"state" : @"newState",
                                                                               @"oldState" : @"oldState"}];
 }
 

KMSClient/KMSClient/ModelLayer/KMSMessage.h

@@ -19,8 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import <Mantle/MTLModel.h>
-#import <Mantle/MTLJSONAdapter.h>
+#import <Mantle/Mantle.h>
 
 /**
  *  KMSMessage is a shared request/response model.

KMSClient/KMSClient/ModelLayer/KMSMessageParams.h

@@ -19,8 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import <Mantle/MTLModel.h>
-#import <Mantle/MTLJSONAdapter.h>
+#import <Mantle/Mantle.h>
+
 #import "KMSCreationType.h"
 #import "KMSConstructorParams.h"
 #import "KMSInvocationOperation.h"

KMSClient/KMSClient/ModelLayer/KMSMessageParams.m

@@ -20,9 +20,6 @@
 // THE SOFTWARE.
 
 #import "KMSMessageParams.h"
-#import "NSDictionary+Merge.h"
-#import <Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h>
-
 
 @implementation KMSMessageParams
 
@@ -44,7 +41,7 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey{
 @implementation KMSMessageParamsCreate
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"type" : @"type",
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"type" : @"type",
                                                                                 @"constructorParams" : @"constructorParams"}];
 }
 
@@ -71,7 +68,7 @@ @implementation KMSMessageParamsInvoke
 @synthesize operationParams;
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
 
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"object" : @"object",
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"object" : @"object",
                                                                                 @"operation" : @"operation",
                                                                                 @"operationParams" : @"operationParams"}];
 
@@ -120,7 +117,7 @@ + (NSValueTransformer *)operationParamsJSONTransformer{
 @implementation KMSMessageParamsEvent
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"value" : @"value"}];
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"value" : @"value"}];
 }
 
 + (NSValueTransformer *)valueJSONTransformer{
@@ -133,7 +130,7 @@ + (NSValueTransformer *)valueJSONTransformer{
 @implementation KMSMessageParamsRelease
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"object" : @"object"}];
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"object" : @"object"}];
 }
 
 @end
@@ -142,7 +139,7 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey{
 @implementation KMSMessageParamsSubscribe
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
 
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"object" : @"object",
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"object" : @"object",
                                                                                 @"type" : @"type"}];
 }
 
@@ -160,7 +157,7 @@ + (NSValueTransformer *)typeJSONTransformer{
 @implementation KMSMessageParamsUnsubscribe
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"object" : @"object",
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"object" : @"object",
                                                                                 @"subscription" : @"subscription"}];
 }
 

KMSClient/KMSClient/ModelLayer/KMSRequestMessage.m

@@ -20,13 +20,12 @@
 // THE SOFTWARE.
 
 #import "KMSRequestMessage.h"
-#import "NSDictionary+Merge.h"
-
-#import <Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h>
 
 
 @interface KMSRequestMessage ()
- @property(assign,nonatomic,readwrite) KMSMethod method;
+
+@property (assign, nonatomic, readwrite) KMSMethod method;
+
 @end
 
 
@@ -69,7 +68,7 @@ + (Class)classForParamsJSONTransformer{
 #pragma mark JSONKeyPathsByPropertyKey
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"method" : @"method",
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"method" : @"method",
                                                                                 @"params" : @"params"}];
 }
 

KMSClient/KMSClient/ModelLayer/KMSResponseMessage.m

@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 
 #import "KMSResponseMessage.h"
-#import "NSDictionary+Merge.h"
+
 #import <Mantle/MTLValueTransformer.h>
 
 @implementation KMSResponseMessage
@@ -30,8 +30,8 @@ @implementation KMSResponseMessage
 
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return [[super JSONKeyPathsByPropertyKey] dictionaryByMergingDictionary:@{@"result" : @"result",
-                                                                                @"error" : @"error"}];
+    return [[super JSONKeyPathsByPropertyKey] mtl_dictionaryByAddingEntriesFromDictionary:@{@"result" : @"result",
+                                                                                     @"error" : @"error"}];
 }
 
 + (NSValueTransformer *)resultJSONTransformer{

KMSClient/Podfile

@@ -3,14 +3,11 @@ workspace 'KMSClient.xcworkspace'
 platform :ios, '8.0'
 use_frameworks!
 
-
 def shared_pods
    pod 'SocketRocket', '0.5.1'
    pod 'ReactiveObjC', '3.0.0'
    pod 'MantleNullValuesOmit', '0.0.2'
-   pod 'NSDictionaryMerge', '1.0'
    pod 'Mantle', '2.1.0'
-
 end
 
 target :LoopBackCall do

KMSClient/Podfile.lock

@@ -4,27 +4,24 @@ PODS:
   - Mantle/extobjc (2.1.0)
   - MantleNullValuesOmit (0.0.2):
     - Mantle (= 2.1.0)
-  - NSDictionaryMerge (1.0)
   - ReactiveObjC (3.0.0)
   - SocketRocket (0.5.1)
   - WebRTC (63.11.20455)
 
 DEPENDENCIES:
   - Mantle (= 2.1.0)
   - MantleNullValuesOmit (= 0.0.2)
-  - NSDictionaryMerge (= 1.0)
   - ReactiveObjC (= 3.0.0)
   - SocketRocket (= 0.5.1)
   - WebRTC (= 63.11.20455)
 
 SPEC CHECKSUMS:
   Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
   MantleNullValuesOmit: 620999256d7aee9a7e2c411d5e2cad01ef4f778d
-  NSDictionaryMerge: 27071382a60ebf258eaed63f17430a51fb4c0c00
   ReactiveObjC: ce79989e8684b9086b5f8d0c74bc7b81a8729c9e
   SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
   WebRTC: f2a6203584745fe53532633397557876b5d71640
 
-PODFILE CHECKSUM: 8a8d374a9d33e3a857461bf5800591df3373fb5d
+PODFILE CHECKSUM: 053da302eda455cc3f23ab8173c61b953e39de7b
 
 COCOAPODS: 1.3.1