diff --git a/Code/CoreData/RKManagedObjectStore.m b/Code/CoreData/RKManagedObjectStore.m index 5490d31cc0..db17b67e44 100644 --- a/Code/CoreData/RKManagedObjectStore.m +++ b/Code/CoreData/RKManagedObjectStore.m @@ -104,24 +104,8 @@ - (id)initWithStoreFilename:(NSString *)storeFilename inDirectory:(NSString *)ni // NOTE: allBundles permits Core Data setup in unit tests nilOrManagedObjectModel = [NSManagedObjectModel mergedModelFromBundles:[NSBundle allBundles]]; } - NSMutableArray* allManagedObjectModels = [[NSMutableArray alloc] init]; - [allManagedObjectModels addObject:nilOrManagedObjectModel]; - - NSBundle *restKitResourcesBundle = [NSBundle restKitResourcesBundle]; - if (restKitResourcesBundle) { - NSURL* rkCoreDataLibraryMOMURL = [restKitResourcesBundle URLForResource:@"RestKitCoreData" - withExtension:@"momd"]; - NSManagedObjectModel* rkCoreDataLibraryMOM = [[NSManagedObjectModel alloc] initWithContentsOfURL:rkCoreDataLibraryMOMURL]; - if (rkCoreDataLibraryMOM) { - [allManagedObjectModels addObject:rkCoreDataLibraryMOM]; - [rkCoreDataLibraryMOM release]; - } else { - RKLogWarning(@"Unable to find RestKitCoreData.momd within the RestKitResources.bundle"); - } - } - + NSMutableArray* allManagedObjectModels = [NSMutableArray arrayWithObject:nilOrManagedObjectModel]; _managedObjectModel = [[NSManagedObjectModel modelByMergingModels:allManagedObjectModels] retain]; - [allManagedObjectModels release]; if (nilOrNameOfSeedDatabaseInMainBundle) { [self createStoreIfNecessaryUsingSeedDatabase:nilOrNameOfSeedDatabaseInMainBundle]; diff --git a/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/elements b/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/elements index 7caa4d788e..5f7c122978 100644 Binary files a/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/elements and b/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/elements differ diff --git a/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/layout b/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/layout index 4d0b11dbf7..58e9ca842d 100644 Binary files a/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/layout and b/Resources/RestKitCoreData.xcdatamodeld/RestKitCoreData.xcdatamodel/layout differ diff --git a/RestKit.xcodeproj/project.pbxproj b/RestKit.xcodeproj/project.pbxproj index bd50a497a9..19c256a896 100644 --- a/RestKit.xcodeproj/project.pbxproj +++ b/RestKit.xcodeproj/project.pbxproj @@ -514,7 +514,6 @@ 259C3027151280A1003066A2 /* grayArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE314F8022600C3CF3F /* grayArrow@2x.png */; }; 259C3028151280A1003066A2 /* whiteArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE414F8022600C3CF3F /* whiteArrow.png */; }; 259C3029151280A1003066A2 /* whiteArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE514F8022600C3CF3F /* whiteArrow@2x.png */; }; - 259C302A151280B0003066A2 /* RestKitCoreData.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1ADB14F8022600C3CF3F /* RestKitCoreData.xcdatamodeld */; }; 25A34245147D8AAA0009758D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25A34244147D8AAA0009758D /* Security.framework */; }; 25B408261491CDDC00F21111 /* RKDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 25B408241491CDDB00F21111 /* RKDirectory.h */; settings = {ATTRIBUTES = (Public, ); }; }; 25B408271491CDDC00F21111 /* RKDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 25B408241491CDDB00F21111 /* RKDirectory.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -2572,7 +2571,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 259C302A151280B0003066A2 /* RestKitCoreData.xcdatamodeld in Resources */, 259C3022151280A1003066A2 /* blackArrow.png in Resources */, 259C3023151280A1003066A2 /* blackArrow@2x.png in Resources */, 259C3024151280A1003066A2 /* blueArrow.png in Resources */, diff --git a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom deleted file mode 100644 index 91c72693f3..0000000000 Binary files a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom and /dev/null differ diff --git a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo deleted file mode 100644 index bf8fcc4c9c..0000000000 Binary files a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo and /dev/null differ diff --git a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist deleted file mode 100644 index 1c47738ecd..0000000000 --- a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - NSManagedObjectModel_CurrentVersionName - RestKitCoreData - NSManagedObjectModel_VersionHashes - - RestKitCoreData - - RKDummyEntity - - /6y2a2HzepaKWU6jyRbFbNGg8ziPU4p6yr40qUG6bx8= - - RKSearchWord - - 8ILMzYCnYe8uGzdLHqnxo6RUX+ifEi9tjcRr4dRZL24= - - RKSearchableManagedObject - - mkPRCudukXRO5vBX5pUU6ldJVkhf7bE7wkbmDOlxJDo= - - - - -