Merge pull request #285 from ericb0774/master

Update deprecated plist serialization method.
appsquickly · Nov 30, 2014 · 97d042a · 97d042a
2 parents a908e11 + 3023cb4
commit 97d042a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...e/Configuration/ConfigPostProcessor/TyphoonConfiguration/TyphoonPlistStyleConfiguration.m b/...e/Configuration/ConfigPostProcessor/TyphoonConfiguration/TyphoonPlistStyleConfiguration.m
@@ -23,19 +23,19 @@ - (id)init
 
 - (void)appendResource:(id<TyphoonResource>)resource
 {
-    NSString *errorString = nil;
-    NSDictionary *dictionary = [NSPropertyListSerialization propertyListFromData:[resource data]
-                                                                mutabilityOption:NSPropertyListImmutable
+    NSError *error = nil;
+    NSDictionary *dictionary = [NSPropertyListSerialization propertyListWithData:[resource data]
+                                                                         options:NSPropertyListImmutable
                                                                           format:NULL
-                                                                errorDescription:&errorString];
+                                                                           error:&error];
     if (![dictionary isKindOfClass:[NSDictionary class]]) {
         [NSException raise:NSInvalidArgumentException format:@"Root plist object must be a dictionary"];
     }
 
-    if (!errorString) {
+    if (!error) {
         [_properties addEntriesFromDictionary:dictionary];
     } else {
-        [NSException raise:NSInvalidArgumentException format:@"Can't prase plist configuration file: %@", errorString];
+        [NSException raise:NSInvalidArgumentException format:@"Can't parse plist configuration file: %@", error.localizedDescription];
     }
 }
 
@@ -44,4 +44,4 @@ - (id)objectForKey:(NSString *)key
     return [_properties valueForKeyPath:key];
 }
 
-@end
+@end