diff --git a/Code/Support/NSBundle+RKAdditions.h b/Code/Support/NSBundle+RKAdditions.h index 7dbb13f3..06b74a5f 100644 --- a/Code/Support/NSBundle+RKAdditions.h +++ b/Code/Support/NSBundle+RKAdditions.h @@ -30,6 +30,17 @@ */ @interface NSBundle (RKAdditions) +/** + Returns an NSBundle reference to the RestKitResources.bundle file containing + RestKit specific resource assets. + + This method is a convenience wrapper for invoking + `[NSBundle bundleWithIdentifier:@"org.restkit.RestKitResources"]` + + @return An NSBundle object corresponding to the RestKitResources.bundle file. + */ ++ (NSBundle *)restKitResourcesBundle; + /** Returns the MIME Type for the resource identified by the specified name and file extension. diff --git a/Code/Support/NSBundle+RKAdditions.m b/Code/Support/NSBundle+RKAdditions.m index 6bde49ea..bfb3b5b8 100644 --- a/Code/Support/NSBundle+RKAdditions.m +++ b/Code/Support/NSBundle+RKAdditions.m @@ -26,6 +26,10 @@ @implementation NSBundle (RKAdditions) ++ (NSBundle *)restKitResourcesBundle { + return [NSBundle bundleWithIdentifier:@"org.restkit.RestKitResources"]; +} + - (NSString *)MIMETypeForResource:(NSString *)name withExtension:(NSString *)extension { NSString *resourcePath = [self pathForResource:name ofType:extension]; if (resourcePath) { diff --git a/Code/Support/Support.h b/Code/Support/Support.h index 3bb5faee..e7cd671d 100644 --- a/Code/Support/Support.h +++ b/Code/Support/Support.h @@ -3,7 +3,7 @@ // RestKit // // Created by Blake Watters on 9/30/10. -// Copyright 2010 Two Toasters +// Copyright 2010 RestKit // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,10 +22,11 @@ #import "RKErrors.h" #import "RKMIMETypes.h" #import "RKLog.h" +#import "RKPathMatcher.h" +#import "RKDotNetDateFormatter.h" +#import "RKDirectory.h" // Load our categories #import "NSDictionary+RKAdditions.h" #import "NSString+RestKit.h" -#import "RKPathMatcher.h" -#import "RKDotNetDateFormatter.h" -#import "RKDirectory.h" +#import "NSBundle+RKAdditions.h" diff --git a/Resources/RestKitCoreData.xcdatamodeld/.xccurrentversion b/Resources/RestKitCoreData.xcdatamodeld/.xccurrentversion index 0c67376e..ee8fe340 100644 --- a/Resources/RestKitCoreData.xcdatamodeld/.xccurrentversion +++ b/Resources/RestKitCoreData.xcdatamodeld/.xccurrentversion @@ -1,5 +1,8 @@ - + + _XCCurrentVersionName + RestKitCoreData.xcdatamodel + diff --git a/RestKit.xcodeproj/project.pbxproj b/RestKit.xcodeproj/project.pbxproj index d72f6a89..de8391b3 100644 --- a/RestKit.xcodeproj/project.pbxproj +++ b/RestKit.xcodeproj/project.pbxproj @@ -2595,7 +2595,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rsync -av --delete ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME} ${SOURCE_ROOT}/${FULL_PRODUCT_NAME}"; + shellScript = "echo \"rsync -av --delete ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME} ${SOURCE_ROOT}/${FULL_PRODUCT_NAME}\""; }; /* End PBXShellScriptBuildPhase section */ @@ -3314,6 +3314,7 @@ 25EC1B0A14F8078100C3CF3F /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ diff --git a/RestKitResources.bundle/Contents/Info.plist b/RestKitResources.bundle/Contents/Info.plist deleted file mode 100644 index fcc9ffed..00000000 --- a/RestKitResources.bundle/Contents/Info.plist +++ /dev/null @@ -1,60 +0,0 @@ - - - - - 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 - 4E109 - DTPlatformVersion - GM - DTSDKBuild - 11D50a - DTSDKName - macosx10.7 - DTXcode - 0430 - DTXcodeBuild - 4E109 - NSHumanReadableCopyright - Copyright © 2012 __MyCompanyName__. All rights reserved. - - 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 a01932d9..00000000 Binary files a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.mom and /dev/null differ diff --git a/RestKitResources.bundle/Contents/Resources/en.lproj/InfoPlist.strings b/RestKitResources.bundle/Contents/Resources/en.lproj/InfoPlist.strings deleted file mode 100644 index 5e45963c..00000000 Binary files a/RestKitResources.bundle/Contents/Resources/en.lproj/InfoPlist.strings and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/Info.plist b/RestKitResources.bundle/Info.plist similarity index 100% rename from RestKitResources.bundle/RestKitResources.bundle/Info.plist rename to RestKitResources.bundle/Info.plist diff --git a/RestKitResources.bundle/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom b/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom similarity index 100% rename from RestKitResources.bundle/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom rename to RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.mom diff --git a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo b/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.omo similarity index 80% rename from RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo rename to RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.omo index ac35c9e5..4351b415 100644 Binary files a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/RestKitCoreData.omo and b/RestKitResources.bundle/RestKitCoreData.momd/RestKitCoreData.omo differ diff --git a/RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist b/RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist similarity index 100% rename from RestKitResources.bundle/Contents/Resources/RestKitCoreData.momd/VersionInfo.plist rename to RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist diff --git a/RestKitResources.bundle/RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist b/RestKitResources.bundle/RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist deleted file mode 100644 index e2634a25..00000000 --- a/RestKitResources.bundle/RestKitResources.bundle/RestKitCoreData.momd/VersionInfo.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - NSManagedObjectModel_VersionHashes - - RestKitCoreData - - RKSearchWord - - 8ILMzYCnYe8uGzdLHqnxo6RUX+ifEi9tjcRr4dRZL24= - - RKSearchableManagedObject - - mkPRCudukXRO5vBX5pUU6ldJVkhf7bE7wkbmDOlxJDo= - - - - - diff --git a/RestKitResources.bundle/RestKitResources.bundle/blackArrow.png b/RestKitResources.bundle/RestKitResources.bundle/blackArrow.png deleted file mode 100644 index 6d2ffbc3..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/blackArrow.png and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/blackArrow@2x.png b/RestKitResources.bundle/RestKitResources.bundle/blackArrow@2x.png deleted file mode 100644 index ec4ec0e0..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/blackArrow@2x.png and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/blueArrow.png b/RestKitResources.bundle/RestKitResources.bundle/blueArrow.png deleted file mode 100644 index d6240d4a..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/blueArrow.png and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/blueArrow@2x.png b/RestKitResources.bundle/RestKitResources.bundle/blueArrow@2x.png deleted file mode 100644 index a6a7e55c..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/blueArrow@2x.png and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/grayArrow.png b/RestKitResources.bundle/RestKitResources.bundle/grayArrow.png deleted file mode 100644 index d69e9d94..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/grayArrow.png and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/grayArrow@2x.png b/RestKitResources.bundle/RestKitResources.bundle/grayArrow@2x.png deleted file mode 100644 index 9d42357c..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/grayArrow@2x.png and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/whiteArrow.png b/RestKitResources.bundle/RestKitResources.bundle/whiteArrow.png deleted file mode 100644 index 4bf56902..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/whiteArrow.png and /dev/null differ diff --git a/RestKitResources.bundle/RestKitResources.bundle/whiteArrow@2x.png b/RestKitResources.bundle/RestKitResources.bundle/whiteArrow@2x.png deleted file mode 100644 index 70569746..00000000 Binary files a/RestKitResources.bundle/RestKitResources.bundle/whiteArrow@2x.png and /dev/null differ diff --git a/RestKitResources.bundle/Contents/Resources/blackArrow.png b/RestKitResources.bundle/blackArrow.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/blackArrow.png rename to RestKitResources.bundle/blackArrow.png diff --git a/RestKitResources.bundle/Contents/Resources/blackArrow@2x.png b/RestKitResources.bundle/blackArrow@2x.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/blackArrow@2x.png rename to RestKitResources.bundle/blackArrow@2x.png diff --git a/RestKitResources.bundle/Contents/Resources/blueArrow.png b/RestKitResources.bundle/blueArrow.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/blueArrow.png rename to RestKitResources.bundle/blueArrow.png diff --git a/RestKitResources.bundle/Contents/Resources/blueArrow@2x.png b/RestKitResources.bundle/blueArrow@2x.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/blueArrow@2x.png rename to RestKitResources.bundle/blueArrow@2x.png diff --git a/RestKitResources.bundle/Contents/Resources/grayArrow.png b/RestKitResources.bundle/grayArrow.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/grayArrow.png rename to RestKitResources.bundle/grayArrow.png diff --git a/RestKitResources.bundle/Contents/Resources/grayArrow@2x.png b/RestKitResources.bundle/grayArrow@2x.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/grayArrow@2x.png rename to RestKitResources.bundle/grayArrow@2x.png diff --git a/RestKitResources.bundle/Contents/Resources/whiteArrow.png b/RestKitResources.bundle/whiteArrow.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/whiteArrow.png rename to RestKitResources.bundle/whiteArrow.png diff --git a/RestKitResources.bundle/Contents/Resources/whiteArrow@2x.png b/RestKitResources.bundle/whiteArrow@2x.png similarity index 100% rename from RestKitResources.bundle/Contents/Resources/whiteArrow@2x.png rename to RestKitResources.bundle/whiteArrow@2x.png