Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deprecated plist serialization method. #285

Merged
merged 1 commit into from
Nov 30, 2014
Merged

Update deprecated plist serialization method. #285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...e/Configuration/ConfigPostProcessor/TyphoonConfiguration/TyphoonPlistStyleConfiguration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}

Expand All @@ -44,4 +44,4 @@ - (id)objectForKey:(NSString *)key
return [_properties valueForKeyPath:key];
}

@end
@end