Skip to content

Commit

Permalink
Merge pull request #42 from ztory/master
Browse files Browse the repository at this point in the history
Updated to the latest Realm.io version (0.92)
  • Loading branch information
matthewcheok committed May 7, 2015
2 parents a961f32 + 538ccaa commit 334adac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Realm+JSON.podspec
Expand Up @@ -16,5 +16,5 @@ Pod::Spec.new do |s|
s.source_files = 'Realm+JSON/*.{h,m}'
s.public_header_files = 'Realm+JSON/*.h'

s.dependency 'Realm', '~> 0.91'
s.dependency 'Realm', '~> 0.92'
end
4 changes: 2 additions & 2 deletions Realm+JSON/RLMObject+JSON.m
Expand Up @@ -77,7 +77,7 @@ + (NSArray *)createOrUpdateInRealm:(RLMRealm *)realm withJSONArray:(NSArray *)ar
}

+ (instancetype)createOrUpdateInRealm:(RLMRealm *)realm withJSONDictionary:(NSDictionary *)dictionary {
return [self createOrUpdateInRealm:realm withObject:[self mc_createObjectFromJSONDictionary:dictionary]];
return [self createOrUpdateInRealm:realm withValue:[self mc_createObjectFromJSONDictionary:dictionary]];
}

+ (instancetype)objectInRealm:(RLMRealm *)realm withPrimaryKeyValue:(id)primaryKeyValue {
Expand All @@ -103,7 +103,7 @@ + (instancetype)objectInRealm:(RLMRealm *)realm withPrimaryKeyValue:(id)primaryK
}

- (instancetype)initWithJSONDictionary:(NSDictionary *)dictionary {
self = [self initWithObject:[[self class] mc_createObjectFromJSONDictionary:dictionary]];
self = [self initWithValue:[[self class] mc_createObjectFromJSONDictionary:dictionary]];
if (self) {
}
return self;
Expand Down

0 comments on commit 334adac

Please sign in to comment.