From 6efa73fa25b61728338cd22fd1e4c96de33d90aa Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Thu, 15 Mar 2012 15:39:06 -0400 Subject: [PATCH] Fixed issues with accessing RestKitResources.bundle from within unit tests --- Code/CoreData/RKManagedObjectStore.m | 19 ++-- Code/Support/NSBundle+RKAdditions.m | 10 ++ Resources/en.lproj/InfoPlist.strings | 1 + RestKit.xcodeproj/project.pbxproj | 92 +++++++++--------- RestKitResources.bundle/Contents/Info.plist | 60 ++++++++++++ .../RestKitCoreData.momd/RestKitCoreData.mom | Bin 0 -> 2070 bytes .../RestKitCoreData.momd/RestKitCoreData.omo | Bin 0 -> 4264 bytes .../RestKitCoreData.momd/VersionInfo.plist | 4 + .../{ => Contents/Resources}/blackArrow.png | Bin .../Resources}/blackArrow@2x.png | Bin .../{ => Contents/Resources}/blueArrow.png | Bin .../{ => Contents/Resources}/blueArrow@2x.png | Bin .../{ => Contents/Resources}/grayArrow.png | Bin .../{ => Contents/Resources}/grayArrow@2x.png | Bin .../{ => Contents/Resources}/whiteArrow.png | Bin .../Resources}/whiteArrow@2x.png | Bin RestKitResources.bundle/Info.plist | Bin 916 -> 0 bytes .../RestKitCoreData.momd/RestKitCoreData.mom | Bin 2057 -> 0 bytes .../RestKitCoreData.momd/RestKitCoreData.omo | Bin 3208 -> 0 bytes 19 files changed, 132 insertions(+), 54 deletions(-) create mode 100644 Resources/en.lproj/InfoPlist.strings create mode 100644 RestKitResources.bundle/Contents/Info.plist create mode 100644 RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom create mode 100644 RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo rename RestKitResources.bundle/{ => Contents/Resources}/RestKitCoreData.momd/VersionInfo.plist (85%) rename RestKitResources.bundle/{ => Contents/Resources}/blackArrow.png (100%) rename RestKitResources.bundle/{ => Contents/Resources}/blackArrow@2x.png (100%) rename RestKitResources.bundle/{ => Contents/Resources}/blueArrow.png (100%) rename RestKitResources.bundle/{ => Contents/Resources}/blueArrow@2x.png (100%) rename RestKitResources.bundle/{ => Contents/Resources}/grayArrow.png (100%) rename RestKitResources.bundle/{ => Contents/Resources}/grayArrow@2x.png (100%) rename RestKitResources.bundle/{ => Contents/Resources}/whiteArrow.png (100%) rename RestKitResources.bundle/{ => Contents/Resources}/whiteArrow@2x.png (100%) delete mode 100644 RestKitResources.bundle/Info.plist delete mode 100644 RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom delete mode 100644 RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.omo 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 0000000000000000000000000000000000000000..91c72693f3f6eb63856f8eb63048a32137c7dd4e GIT binary patch literal 2070 zcmaJ?du&rx96t9vx|K3^yRPe=JSz_w3t13xG2p_OY;|R}-2(>J+xBcL>)LYfEv%De z2StccgMZ-rwXJFt1jHx_3W_4AAOe#R93T%75P^_jVh9>N_jVgYhfQwo@BYp?-*@$0!RRq#XOzx+sM=Gzs6lFKW=}u=!mF=!z5CuLpYHl<&$l)9a4Zx$VjN)_nKmk2 zT;z1m3#&mjNENS`>2%j7c`5>wXB&h3tJdxhNeUmeIo;({^*6idvKUoV4{eQxB$X-* zve9fD13#EDESc7vI;Xp+g~k<*T-3i=W=v$+vKeBSkwk7@J~OZsW?ABLl*L+G<2rxb zE9STyZmLx!`9icx3QJ8iut2YN@xVx3L=N}0Kbx?u%lG4oQ>KbtLG6PsE*h3vgW;xI8nO}0!~_Od8h;S4J(Z#3S{e5w>zFyU@V=5F z(I(EZajFWX)TgMj|VV9eY)Zr^@dMX{9rmkLxOsY^u z6~7#eYN$O69m5a&pPf3}5-&4$XED^B%M5zLPkAE1%-xMFqe0OdL9<&q8C=>DGPQ;y z(PdL)B|kfFMO(bRB+wD)=+vqCZq#5{(sq;Fo>$EF@+$wG*1Y2dC+BD~&=6IrD;A<& zk=tGo){Yo;QQp%WN@)&8y<#p08fHL)(v4c6iy(y_8En6}HpUyUN@|-MiG@`y42Jd4 z<*jBGMp%j{uq>9ztVU)Q0e`L!Y3Wr{3s)D3+2T{#EJrurrh8Ag_t}ixu0@_Le??nk zprpN{y`z(N73T0+EQ6Vi%*w1>hNO!BIZg^U^u?FBLr(Y5a);QOc=;9X>z&7S#rh9i ze8{@n4yx|z8*dIYRc6oI%-EA?XSvMU^G=-Qu}sejZt#f>EgRq8wAr*J5}l%Sfrc#ZRsld1NW9 zG)ClBDr;6WXy>US9H4D9pjR}AqR$?@1DM4OcW{w`krl9fBj02$Zx%Oa3^#GPcI?y{ z1{V*hIq})&Tq{mL+~A#r>NQ!u_>zt7-p$5TbNIbq*Kjhb_I%?=20XWK{~a!`p6@sx zzp973*0@YuE*dE9|8qEeu+Sq%A}SL=DlmgwFab;h#o%7B82CU7SPq^A>%nI50r(Jn z1h#>lU=KJ1dcjd}4D^8$;50Z3&VlpbcR>^igkoWiP$@`4oA8|Qy0B5$E*uhig(JdI z;h4}ToDhBzP77y+bHYuS3P-?^a1<1w8Cswf+F%aMg9XqIC&Ec^GMoly!BSWU8(=eB z2HRjedR{tne7>Z?1sa759s6# zH|O4Se&^%fb3b0Aa&&)-t)Zbo5aV)KoP5gO*4S)s+u0lp`8yJ!&2r0VTkB4Hd+Pa6 zhcMnc+T7gOx~(m?Jsk`Q9pd;l#;i%ks;@A{${DNrOXbW0ybPK~75kvG1|ZJ>uY&dp zv{j5*9s#}w+u`jSbopG4fgS>7Ijo6FZfAEY8cp{|$#7DeE2)rMY2fk<2$B#K z1B3o?aSTe5OHdn?e6b1Y8o9pSK2gdu1|ZZ<; zx+jtuxb9~XA{pe=#XY2u%i~GL!%|Qgf*l?-CAokjla;%P7 zUOe{J>Z&1|l!`=l`|h>6JWeq!1{@k{W=*X(F3ZV7ma26dw=}lccXT>Ddq&kvEO;W3 z^qr*+*>f7tXPZ&<@2PVW!qS1)G9#|3%j-Xj%p6%0D5$0xn>wF@uUb`-MvruOs07k;|dez0=- zNav=7Gk;e;asKS$(Wxt+y3^~gUH#5*bLeNs#Fv=}&ni_5^=f}D@D0X0)y!1a(|**? zn<+Y1h;j1cqK6tCSgH3`zO&Nt@%_o4PX$QpbL6GWq*?>rPA$#ngYos-n33O7axnLY zH&wlEe&_l9|9YF}hj(js7aG0^^qg0!V;-NIkKtS*-k49PHl}Rx4MI$T8kKzny6nkd z@Oh$sw~#$n8twU-P+Z~wQ3%JpkJTW<9L>%h;;BJbA&X&t<=&dcw{nE&#n7-l^C zLaSPSJ;{cb;}{#h88ui_!+mW0j{$2&F>np|bpVk3*Ph2KOZr Z$<6i{>Ip}j-b&t%e*@7LiEu^Z{s$3%JURdX literal 0 HcmV?d00001 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 44f28a062c7ff1ad47b72432a025f9052e3de660..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 916 zcmZuvOK;Oa5T4!eD9>(F68dg{0)-08sRUO<;|8Ka8sfAF32M2{)>-0st@XO#J6!k= zNQ46th#NN!9C|?{{aDK)=jKdRcGZHdA@I6JG&luER?#wONJ5796NsEs+#Xdt_dhhm3=K8jbgc@S}$S7ea{ch*-7Maoe zax1ZiREnvEK8ky*jQ8thS4Ou5rcg@9ZP3J^|5^xA01_2CQXn}+Rd{W;$=ulL; z0Ck`cD*uvVNYIq$9(d{$4#b3ee+iE&@21jC&@4jgG?YtBEk5LtaA>%l8}H_xEc&i` zqpin9^%M?uWfnEPu~0Q0b}uJjEos?ITQ=`#`VmRH*9fx61Q)I*RJ}Hn+Tpsj#$6@# z>M{(dsTN@wUcgIu16}wETd)g%Q5Mak`)C!l(QEV(eM7&{4#qf-=kQzn4!_4A@Mru5 kf5%(+2mXn7@Gkz1|KNX_Tqd6xhdsflXJM{y`zAB>AB(UQ+yDRo diff --git a/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom b/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom deleted file mode 100644 index 97db69c5f9ca9e44312aa399e4f28d98db705817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2057 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