MPKitConfigurationTest fix

Author: BrandonStalnaker

UnitTests/ObjCTests/MPKitConfigurationTests.mm

@@ -81,7 +81,7 @@ - (void)tearDown {
 
 - (void)testInstance {
     XCTAssertNotNil(kitConfiguration);
-    XCTAssertEqualObjects(kitConfiguration.configurationHash, @(762651950));
+    XCTAssertEqualObjects(kitConfiguration.configurationHash, @(969680750));
     XCTAssertEqualObjects(kitConfiguration.integrationId, @37);
     XCTAssertEqualObjects(kitConfiguration.attributeValueFilteringHashedAttribute, @"12345");
     XCTAssertEqualObjects(kitConfiguration.attributeValueFilteringHashedValue, @"54321");
@@ -183,7 +183,7 @@ - (void)testInvalidConfiguration {
 
     kitConfig = [[MPKitConfiguration alloc] initWithDictionary:configuration];
     XCTAssertNotNil(kitConfig);
-    XCTAssertEqualObjects(kitConfig.configurationHash, @(1495473349));
+    XCTAssertEqualObjects(kitConfig.configurationHash, @(-1872513399));
     XCTAssertEqualObjects(kitConfig.integrationId, @80);
 
     XCTAssertNil(kitConfig.filters);

mParticle-Apple-SDK/Kits/MPKitConfiguration.mm

@@ -23,7 +23,11 @@ - (instancetype)initWithDictionary:(NSDictionary *)configurationDictionary {
         return nil;
     }
 
-    NSData *ekConfigData = [NSJSONSerialization dataWithJSONObject:configurationDictionary options:0 error:nil];
+    NSJSONWritingOptions options = 0;
+    if (@available(iOS 11.0, tvOS 11.0, *)) {
+        options = NSJSONWritingSortedKeys;
+    }
+    NSData *ekConfigData = [NSJSONSerialization dataWithJSONObject:configurationDictionary options:options error:nil];
     NSString *ekConfigString = [[NSString alloc] initWithData:ekConfigData encoding:NSUTF8StringEncoding];
     _configurationHash = @([[MPIHasher hashString:ekConfigString] intValue]);
 
@@ -114,16 +118,11 @@ - (id)initWithCoder:(NSCoder *)coder {
     @try {
         configurationDictionary = [coder decodeObjectOfClass:[NSDictionary class] forKey:@"configurationDictionary"];
     }
-    
     @catch ( NSException *e) {
         configurationDictionary = nil;
         MPILogError(@"Exception decoding MPKitConfiguration Attributes: %@", [e reason]);
     }
 
-    @finally {
-        self = [self initWithDictionary:configurationDictionary];
-    }
-    
     self = [self initWithDictionary:configurationDictionary];
     if (!self) {
         return nil;