From 0e9c2602335e271ef3429add6b30686c222e0f7e Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 13 Apr 2012 16:07:55 +0200 Subject: [PATCH 1/4] delegate would always be nil for managedObjectStore:didFailToCopySeedDatabase:error: --- Code/CoreData/RKManagedObjectStore.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/CoreData/RKManagedObjectStore.m b/Code/CoreData/RKManagedObjectStore.m index 0f0ce8f3..8acc6671 100644 --- a/Code/CoreData/RKManagedObjectStore.m +++ b/Code/CoreData/RKManagedObjectStore.m @@ -127,12 +127,12 @@ static RKManagedObjectStore *defaultObjectStore = nil; NSMutableArray* allManagedObjectModels = [NSMutableArray arrayWithObject:nilOrManagedObjectModel]; _managedObjectModel = [[NSManagedObjectModel modelByMergingModels:allManagedObjectModels] retain]; + _delegate = delegate; + if (nilOrNameOfSeedDatabaseInMainBundle) { [self createStoreIfNecessaryUsingSeedDatabase:nilOrNameOfSeedDatabaseInMainBundle]; } - _delegate = delegate; - [self createPersistentStoreCoordinator]; self.primaryManagedObjectContext = [self newManagedObjectContext]; From d155578a108e6a1124278f9cff2310aed1cd6f73 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Wed, 11 Jul 2012 13:08:44 -0400 Subject: [PATCH 2/4] Fix warning from GCOAuth format string --- Vendor/cocoa-oauth/GCOAuth.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vendor/cocoa-oauth/GCOAuth.m b/Vendor/cocoa-oauth/GCOAuth.m index 343ee4f6..f2f4a224 100644 --- a/Vendor/cocoa-oauth/GCOAuth.m +++ b/Vendor/cocoa-oauth/GCOAuth.m @@ -210,7 +210,7 @@ static BOOL GCOAuthUseHTTPSCookieStorage = YES; time_t t; time(&t); mktime(gmtime(&t)); - return [NSString stringWithFormat:@"%u", (t + GCOAuthTimeStampOffset)]; + return [NSString stringWithFormat:@"%lu", (t + GCOAuthTimeStampOffset)]; } + (NSString *)queryStringFromParameters:(NSDictionary *)parameters { NSMutableArray *entries = [NSMutableArray array]; From 36e3dfcf67f0cc0fc2e95dbf8fb1a1c80b47799f Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Tue, 7 Aug 2012 22:24:28 -0400 Subject: [PATCH 3/4] Fix warning from invalid format string in NSAssert --- Code/CoreData/RKManagedObjectMappingOperation.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/CoreData/RKManagedObjectMappingOperation.m b/Code/CoreData/RKManagedObjectMappingOperation.m index c9ad3385..265d98bf 100644 --- a/Code/CoreData/RKManagedObjectMappingOperation.m +++ b/Code/CoreData/RKManagedObjectMappingOperation.m @@ -54,7 +54,7 @@ RKObjectRelationshipMapping *relationshipMapping = [self.objectMapping mappingForRelationship:relationshipName]; RKObjectMappingDefinition *mapping = relationshipMapping.mapping; - NSAssert(mapping, @"Attempted to connect relationship for keyPath '%@' without a relationship mapping defined."); + NSAssert(mapping, @"Attempted to connect relationship for keyPath '%@' without a relationship mapping defined.", relationshipName); if (! [mapping isKindOfClass:[RKObjectMapping class]]) { RKLogWarning(@"Can only connect relationships for RKObjectMapping relationships. Found %@: Skipping...", NSStringFromClass([mapping class])); return; From 149edd97832466ccbb34165c9cc688ef528c8568 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Tue, 7 Aug 2012 22:25:06 -0400 Subject: [PATCH 4/4] Setting version to 0.10.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 19a5fa43..42624f31 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.11.0-dev \ No newline at end of file +0.10.2 \ No newline at end of file