diff --git a/Code/CoreData/RKManagedObjectStore.m b/Code/CoreData/RKManagedObjectStore.m index a8e1a7ca70..5490d31cc0 100644 --- a/Code/CoreData/RKManagedObjectStore.m +++ b/Code/CoreData/RKManagedObjectStore.m @@ -107,14 +107,17 @@ - (id)initWithStoreFilename:(NSString *)storeFilename inDirectory:(NSString *)ni NSMutableArray* allManagedObjectModels = [[NSMutableArray alloc] init]; [allManagedObjectModels addObject:nilOrManagedObjectModel]; - NSURL* rkCoreDataLibraryMOMURL = [[NSBundle 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"); + 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"); + } } _managedObjectModel = [[NSManagedObjectModel modelByMergingModels:allManagedObjectModels] retain]; diff --git a/Code/Support/NSBundle+RKAdditions.m b/Code/Support/NSBundle+RKAdditions.m index 1746779b90..51852f2c28 100644 --- a/Code/Support/NSBundle+RKAdditions.m +++ b/Code/Support/NSBundle+RKAdditions.m @@ -28,6 +28,16 @@ @implementation NSBundle (RKAdditions) + (NSBundle *)restKitResourcesBundle { + static BOOL searchedForBundle = NO; + + if (! searchedForBundle) { + NSString *path = [[NSBundle mainBundle] pathForResource:@"RestKitResources" ofType:@"bundle"]; + searchedForBundle = YES; + NSBundle *resourcesBundle = [NSBundle bundleWithPath:path]; + if (! resourcesBundle) RKLogWarning(@"Unable to find RestKitResources.bundle in your project. Did you forget to add it?"); + return resourcesBundle; + } + return [NSBundle bundleWithIdentifier:@"org.restkit.RestKitResources"]; } diff --git a/Resources/en.lproj/InfoPlist.strings b/Resources/en.lproj/InfoPlist.strings new file mode 100644 index 0000000000..b92732c79e --- /dev/null +++ b/Resources/en.lproj/InfoPlist.strings @@ -0,0 +1 @@ +/* Localized versions of Info.plist keys */ diff --git a/RestKit.xcodeproj/project.pbxproj b/RestKit.xcodeproj/project.pbxproj index a7ad00105e..bd50a497a9 100644 --- a/RestKit.xcodeproj/project.pbxproj +++ b/RestKit.xcodeproj/project.pbxproj @@ -505,6 +505,16 @@ 257ABAB71511371E00CCAA76 /* NSManagedObject+RKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 257ABAB41511371C00CCAA76 /* NSManagedObject+RKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 257ABAB81511371E00CCAA76 /* NSManagedObject+RKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 257ABAB51511371D00CCAA76 /* NSManagedObject+RKAdditions.m */; }; 257ABAB91511371E00CCAA76 /* NSManagedObject+RKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 257ABAB51511371D00CCAA76 /* NSManagedObject+RKAdditions.m */; }; + 259C301715128079003066A2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EC1B0014F8078100C3CF3F /* CoreFoundation.framework */; }; + 259C3022151280A1003066A2 /* blackArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1ADE14F8022600C3CF3F /* blackArrow.png */; }; + 259C3023151280A1003066A2 /* blackArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1ADF14F8022600C3CF3F /* blackArrow@2x.png */; }; + 259C3024151280A1003066A2 /* blueArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE014F8022600C3CF3F /* blueArrow.png */; }; + 259C3025151280A1003066A2 /* blueArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE114F8022600C3CF3F /* blueArrow@2x.png */; }; + 259C3026151280A1003066A2 /* grayArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE214F8022600C3CF3F /* grayArrow.png */; }; + 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, ); }; }; @@ -660,16 +670,6 @@ 25EC1AC114F8019F00C3CF3F /* RKRefreshTriggerView.h in Headers */ = {isa = PBXBuildFile; fileRef = 25EC1ABA14F8019F00C3CF3F /* RKRefreshTriggerView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 25EC1AC214F8019F00C3CF3F /* RKRefreshTriggerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 25EC1ABB14F8019F00C3CF3F /* RKRefreshTriggerView.m */; }; 25EC1AC314F8019F00C3CF3F /* RKRefreshTriggerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 25EC1ABB14F8019F00C3CF3F /* RKRefreshTriggerView.m */; }; - 25EC1B0114F8078100C3CF3F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EC1B0014F8078100C3CF3F /* CoreFoundation.framework */; }; - 25EC1B0D14F8079800C3CF3F /* RestKitCoreData.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1ADB14F8022600C3CF3F /* RestKitCoreData.xcdatamodeld */; }; - 25EC1B0E14F8079800C3CF3F /* blackArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1ADE14F8022600C3CF3F /* blackArrow.png */; }; - 25EC1B0F14F8079800C3CF3F /* blackArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1ADF14F8022600C3CF3F /* blackArrow@2x.png */; }; - 25EC1B1014F8079800C3CF3F /* blueArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE014F8022600C3CF3F /* blueArrow.png */; }; - 25EC1B1114F8079800C3CF3F /* blueArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE114F8022600C3CF3F /* blueArrow@2x.png */; }; - 25EC1B1214F8079800C3CF3F /* grayArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE214F8022600C3CF3F /* grayArrow.png */; }; - 25EC1B1314F8079800C3CF3F /* grayArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE314F8022600C3CF3F /* grayArrow@2x.png */; }; - 25EC1B1414F8079800C3CF3F /* whiteArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE414F8022600C3CF3F /* whiteArrow.png */; }; - 25EC1B1514F8079800C3CF3F /* whiteArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE514F8022600C3CF3F /* whiteArrow@2x.png */; }; 25EC1B3914F84B5D00C3CF3F /* UIImage+RKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 25EC1B3714F84B5C00C3CF3F /* UIImage+RKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 25EC1B3A14F84B5D00C3CF3F /* UIImage+RKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 25EC1B3714F84B5C00C3CF3F /* UIImage+RKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 25EC1B3B14F84B5D00C3CF3F /* UIImage+RKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 25EC1B3814F84B5C00C3CF3F /* UIImage+RKAdditions.m */; }; @@ -1033,6 +1033,7 @@ 257ABAAF15112DD400CCAA76 /* NSManagedObjectContext+RKAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectContext+RKAdditions.m"; sourceTree = ""; }; 257ABAB41511371C00CCAA76 /* NSManagedObject+RKAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObject+RKAdditions.h"; sourceTree = ""; }; 257ABAB51511371D00CCAA76 /* NSManagedObject+RKAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObject+RKAdditions.m"; sourceTree = ""; }; + 259C301615128079003066A2 /* RestKitResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RestKitResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 25A34244147D8AAA0009758D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 25B408241491CDDB00F21111 /* RKDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKDirectory.h; sourceTree = ""; }; 25B408251491CDDB00F21111 /* RKDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKDirectory.m; sourceTree = ""; }; @@ -1146,7 +1147,6 @@ 25EC1AE314F8022600C3CF3F /* grayArrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "grayArrow@2x.png"; sourceTree = ""; }; 25EC1AE414F8022600C3CF3F /* whiteArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = whiteArrow.png; sourceTree = ""; }; 25EC1AE514F8022600C3CF3F /* whiteArrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "whiteArrow@2x.png"; sourceTree = ""; }; - 25EC1AFF14F8078100C3CF3F /* RestKitResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RestKitResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 25EC1B0014F8078100C3CF3F /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 25EC1B1E14F821B500C3CF3F /* RestKitResources-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RestKitResources-Prefix.pch"; sourceTree = ""; }; 25EC1B1F14F8220800C3CF3F /* RestKitResources-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "RestKitResources-Info.plist"; sourceTree = ""; }; @@ -1233,11 +1233,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 25EC1AFC14F8078100C3CF3F /* Frameworks */ = { + 259C301315128079003066A2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 25EC1B0114F8078100C3CF3F /* CoreFoundation.framework in Frameworks */, + 259C301715128079003066A2 /* CoreFoundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1272,7 +1272,7 @@ 25160D2614564E820060A5C5 /* RestKitTests.octest */, 25160E62145651060060A5C5 /* RestKit.framework */, 25160E78145651060060A5C5 /* RestKitFrameworkTests.octest */, - 25EC1AFF14F8078100C3CF3F /* RestKitResources.bundle */, + 259C301615128079003066A2 /* RestKitResources.bundle */, ); name = Products; sourceTree = ""; @@ -2418,14 +2418,14 @@ productReference = 25160E78145651060060A5C5 /* RestKitFrameworkTests.octest */; productType = "com.apple.product-type.bundle"; }; - 25EC1AFE14F8078100C3CF3F /* RestKitResources */ = { + 259C301515128079003066A2 /* RestKitResources */ = { isa = PBXNativeTarget; - buildConfigurationList = 25EC1B0B14F8078100C3CF3F /* Build configuration list for PBXNativeTarget "RestKitResources" */; + buildConfigurationList = 259C301F15128079003066A2 /* Build configuration list for PBXNativeTarget "RestKitResources" */; buildPhases = ( - 25EC1AFB14F8078100C3CF3F /* Sources */, - 25EC1AFC14F8078100C3CF3F /* Frameworks */, - 25EC1AFD14F8078100C3CF3F /* Resources */, - 25EC1B2414F8229E00C3CF3F /* RSync Bundle to Source Tree */, + 259C301215128079003066A2 /* Sources */, + 259C301315128079003066A2 /* Frameworks */, + 259C301415128079003066A2 /* Resources */, + 259C303B151289DD003066A2 /* Sync Resources to Project */, ); buildRules = ( ); @@ -2433,7 +2433,7 @@ ); name = RestKitResources; productName = RestKitResources; - productReference = 25EC1AFF14F8078100C3CF3F /* RestKitResources.bundle */; + productReference = 259C301615128079003066A2 /* RestKitResources.bundle */; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ @@ -2461,7 +2461,7 @@ 25160D2514564E820060A5C5 /* RestKitTests */, 25160E61145651060060A5C5 /* RestKitFramework */, 25160E77145651060060A5C5 /* RestKitFrameworkTests */, - 25EC1AFE14F8078100C3CF3F /* RestKitResources */, + 259C301515128079003066A2 /* RestKitResources */, ); }; /* End PBXProject section */ @@ -2568,19 +2568,19 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 25EC1AFD14F8078100C3CF3F /* Resources */ = { + 259C301415128079003066A2 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 25EC1B0D14F8079800C3CF3F /* RestKitCoreData.xcdatamodeld in Resources */, - 25EC1B0E14F8079800C3CF3F /* blackArrow.png in Resources */, - 25EC1B0F14F8079800C3CF3F /* blackArrow@2x.png in Resources */, - 25EC1B1014F8079800C3CF3F /* blueArrow.png in Resources */, - 25EC1B1114F8079800C3CF3F /* blueArrow@2x.png in Resources */, - 25EC1B1214F8079800C3CF3F /* grayArrow.png in Resources */, - 25EC1B1314F8079800C3CF3F /* grayArrow@2x.png in Resources */, - 25EC1B1414F8079800C3CF3F /* whiteArrow.png in Resources */, - 25EC1B1514F8079800C3CF3F /* whiteArrow@2x.png in Resources */, + 259C302A151280B0003066A2 /* RestKitCoreData.xcdatamodeld in Resources */, + 259C3022151280A1003066A2 /* blackArrow.png in Resources */, + 259C3023151280A1003066A2 /* blackArrow@2x.png in Resources */, + 259C3024151280A1003066A2 /* blueArrow.png in Resources */, + 259C3025151280A1003066A2 /* blueArrow@2x.png in Resources */, + 259C3026151280A1003066A2 /* grayArrow.png in Resources */, + 259C3027151280A1003066A2 /* grayArrow@2x.png in Resources */, + 259C3028151280A1003066A2 /* whiteArrow.png in Resources */, + 259C3029151280A1003066A2 /* whiteArrow@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2613,19 +2613,19 @@ shellPath = /bin/sh; shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; }; - 25EC1B2414F8229E00C3CF3F /* RSync Bundle to Source Tree */ = { + 259C303B151289DD003066A2 /* Sync Resources to Project */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "RSync Bundle to Source Tree"; + name = "Sync Resources to Project"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "echo \"rsync -av --delete ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME} ${SOURCE_ROOT}/${FULL_PRODUCT_NAME}\""; + shellPath = "/bin/bash -ex"; + shellScript = "rsync -av --delete ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}/ ${SOURCE_ROOT}/${FULL_PRODUCT_NAME}"; }; /* End PBXShellScriptBuildPhase section */ @@ -2997,7 +2997,7 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 25EC1AFB14F8078100C3CF3F /* Sources */ = { + 259C301215128079003066A2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -3263,10 +3263,10 @@ }; name = Release; }; - 25EC1B0914F8078100C3CF3F /* Debug */ = { + 259C302015128079003066A2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Resources/RestKitResources-Prefix.pch"; @@ -3277,15 +3277,15 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; + SDKROOT = macosx; WRAPPER_EXTENSION = bundle; }; name = Debug; }; - 25EC1B0A14F8078100C3CF3F /* Release */ = { + 259C302115128079003066A2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -3296,7 +3296,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; + SDKROOT = macosx; WRAPPER_EXTENSION = bundle; }; name = Release; @@ -3349,11 +3349,11 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 25EC1B0B14F8078100C3CF3F /* Build configuration list for PBXNativeTarget "RestKitResources" */ = { + 259C301F15128079003066A2 /* Build configuration list for PBXNativeTarget "RestKitResources" */ = { isa = XCConfigurationList; buildConfigurations = ( - 25EC1B0914F8078100C3CF3F /* Debug */, - 25EC1B0A14F8078100C3CF3F /* Release */, + 259C302015128079003066A2 /* Debug */, + 259C302115128079003066A2 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/RestKitResources.bundle/Contents/Info.plist b/RestKitResources.bundle/Contents/Info.plist new file mode 100644 index 0000000000..b7c33a135e --- /dev/null +++ b/RestKitResources.bundle/Contents/Info.plist @@ -0,0 +1,60 @@ + + + + + BuildMachineOSBuild + 11D50b + CFBundleDevelopmentRegion + English + CFBundleExecutable + RestKitResources + CFBundleIdentifier + org.restkit.RestKitResources + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + RestKitResources + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + CFPlugInDynamicRegisterFunction + + CFPlugInDynamicRegistration + NO + CFPlugInFactories + + 00000000-0000-0000-0000-000000000000 + MyFactoryFunction + + CFPlugInTypes + + 00000000-0000-0000-0000-000000000000 + + 00000000-0000-0000-0000-000000000000 + + + CFPlugInUnloadFunction + + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 4E1019 + DTPlatformVersion + GM + DTSDKBuild + 11D50a + DTSDKName + macosx10.7 + DTXcode + 0431 + DTXcodeBuild + 4E1019 + NSHumanReadableCopyright + Copyright © 2012 RestKit. All rights reserved. + + diff --git a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom new file mode 100644 index 0000000000..91c72693f3 Binary files /dev/null and b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom differ diff --git a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo new file mode 100644 index 0000000000..bf8fcc4c9c Binary files /dev/null and b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo differ diff --git a/RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist similarity index 85% rename from RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist rename to RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist index 6559681053..1c47738ecd 100644 --- a/RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist +++ b/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist @@ -8,6 +8,10 @@ RestKitCoreData + RKDummyEntity + + /6y2a2HzepaKWU6jyRbFbNGg8ziPU4p6yr40qUG6bx8= + RKSearchWord 8ILMzYCnYe8uGzdLHqnxo6RUX+ifEi9tjcRr4dRZL24= diff --git a/RestKitResources.bundle/blackArrow.png b/RestKitResources.bundle/Contents/Resources/blackArrow.png similarity index 100% rename from RestKitResources.bundle/blackArrow.png rename to RestKitResources.bundle/Contents/Resources/blackArrow.png diff --git a/RestKitResources.bundle/blackArrow@2x.png b/RestKitResources.bundle/Contents/Resources/blackArrow@2x.png similarity index 100% rename from RestKitResources.bundle/blackArrow@2x.png rename to RestKitResources.bundle/Contents/Resources/blackArrow@2x.png diff --git a/RestKitResources.bundle/blueArrow.png b/RestKitResources.bundle/Contents/Resources/blueArrow.png similarity index 100% rename from RestKitResources.bundle/blueArrow.png rename to RestKitResources.bundle/Contents/Resources/blueArrow.png diff --git a/RestKitResources.bundle/blueArrow@2x.png b/RestKitResources.bundle/Contents/Resources/blueArrow@2x.png similarity index 100% rename from RestKitResources.bundle/blueArrow@2x.png rename to RestKitResources.bundle/Contents/Resources/blueArrow@2x.png diff --git a/RestKitResources.bundle/grayArrow.png b/RestKitResources.bundle/Contents/Resources/grayArrow.png similarity index 100% rename from RestKitResources.bundle/grayArrow.png rename to RestKitResources.bundle/Contents/Resources/grayArrow.png diff --git a/RestKitResources.bundle/grayArrow@2x.png b/RestKitResources.bundle/Contents/Resources/grayArrow@2x.png similarity index 100% rename from RestKitResources.bundle/grayArrow@2x.png rename to RestKitResources.bundle/Contents/Resources/grayArrow@2x.png diff --git a/RestKitResources.bundle/whiteArrow.png b/RestKitResources.bundle/Contents/Resources/whiteArrow.png similarity index 100% rename from RestKitResources.bundle/whiteArrow.png rename to RestKitResources.bundle/Contents/Resources/whiteArrow.png diff --git a/RestKitResources.bundle/whiteArrow@2x.png b/RestKitResources.bundle/Contents/Resources/whiteArrow@2x.png similarity index 100% rename from RestKitResources.bundle/whiteArrow@2x.png rename to RestKitResources.bundle/Contents/Resources/whiteArrow@2x.png diff --git a/RestKitResources.bundle/Info.plist b/RestKitResources.bundle/Info.plist deleted file mode 100644 index 44f28a062c..0000000000 Binary files a/RestKitResources.bundle/Info.plist and /dev/null differ diff --git a/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom b/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom deleted file mode 100644 index 97db69c5f9..0000000000 Binary files a/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom and /dev/null differ diff --git a/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.omo b/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.omo deleted file mode 100644 index 4351b41562..0000000000 Binary files a/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.omo and /dev/null differ