Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/0.25.0'

commit 0e7bf231cacce427a49bdcf8a88baad84f932c57 2 parents 0b898aa + fecde9d
@segiddins segiddins authored
Showing with 1,114 additions and 1,100 deletions.
  1. +1 −0  .gitignore
  2. +0 −15 .gitmodules
  3. +1 −1  .ruby-version
  4. +1 −1  .travis.yml
  5. +1 −1  CONTRIBUTING.md
  6. +7 −0 Code/CoreData/RKEntityMapping.h
  7. +1 −0  Code/CoreData/RKEntityMapping.m
  8. +9 −1 Code/CoreData/RKManagedObjectMappingOperationDataSource.m
  9. +25 −0 Code/CoreData/RKManagedObjectStore.m
  10. +17 −6 Code/CoreData/RKRelationshipConnectionOperation.m
  11. +2 −2 Code/Network/RKHTTPRequestOperation.h
  12. +31 −12 Code/Network/RKManagedObjectRequestOperation.m
  13. +5 −4 Code/Network/RKObjectManager.h
  14. +7 −7 Code/Network/RKObjectManager.m
  15. +6 −4 Code/Network/RKResponseMapperOperation.m
  16. +2 −1  Code/ObjectMapping.h
  17. +26 −3 Code/ObjectMapping/RKHTTPUtilities.m
  18. +5 −4 Code/ObjectMapping/RKMappingOperation.m
  19. +2 −1  Code/ObjectMapping/RKObjectMapping.h
  20. +1 −1  Code/ObjectMapping/RKObjectMapping.m
  21. +2 −0  Code/ObjectMapping/RKPropertyMapping.m
  22. +5 −2 Code/Support/RKLumberjackLogger.m
  23. +5 −0 Code/Support/RestKit-Prefix.pch
  24. +11 −10 Code/Support/lcl_config_components_RK.h
  25. +2 −2 Docs/MobileTuts Advanced RestKit/Advanced_RestKit_Tutorial.md
  26. +1 −1  Docs/MobileTuts Introduction to RestKit/index.html
  27. +3 −3 Docs/WRITING_DOCS.md
  28. +4 −0 Examples/RKMacOSX/Podfile
  29. +54 −115 Examples/RKMacOSX/RKMacOSX.xcodeproj/project.pbxproj
  30. +1 −1  Examples/RKMacOSX/RKMacOSX/RKMacOSX-Info.plist
  31. +7 −0 Examples/RKSearchExample/Podfile
  32. +70 −109 Examples/RKSearchExample/RKSearchExample.xcodeproj/project.pbxproj
  33. +1 −1  Examples/RKSearchExample/RKSearchExample/RKSearchExample-Info.plist
  34. +4 −5 Examples/RKTwitter/Podfile
  35. +43 −266 Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
  36. +20 −15 ...xcschemes/RKTwitterCocoaPods.xcscheme → RKTwitter.xcodeproj/xcshareddata/xcschemes/RKTwitter.xcscheme}
  37. +0 −1  Examples/RKTwitter/RKTwitter.xcworkspace/contents.xcworkspacedata
  38. +1 −1  Examples/RKTwitter/Resources/RKTwitter-Info.plist
  39. +9 −0 Examples/RKTwitterCoreData/Podfile
  40. +46 −127 Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj
  41. +1 −1  Examples/RKTwitterCoreData/Resources/RKTwitter-Info.plist
  42. +1 −1  Gemfile
  43. +35 −30 Gemfile.lock
  44. +12 −2 Podfile
  45. +19 −14 Podfile.lock
  46. +6 −6 README.md
  47. +3 −1 Rakefile
  48. +1 −1  Resources/PLISTs/RestKitFramework-Info.plist
  49. +1 −1  Resources/PLISTs/RestKitFrameworkTests-Info.plist
  50. +1 −1  Resources/PLISTs/RestKitTests-Info.plist
  51. +3 −3 RestKit.podspec
  52. +185 −295 RestKit.xcodeproj/project.pbxproj
  53. +4 −1 RestKit.xcworkspace/xcshareddata/xcschemes/Build All Examples.xcscheme
  54. +11 −0 Tests/Fixtures/JSON/cats/catsWithParent_issue_2194.json
  55. +24 −0 Tests/Fixtures/JSON/humans/hoarderWithCats_issue_2192.json
  56. +162 −0 Tests/Logic/CoreData/RKEntityMappingTest.m
  57. +121 −0 Tests/Logic/CoreData/RKFetchedResultsControllerUpdateTest.m
  58. +36 −0 Tests/Logic/CoreData/RKManagedObjectMappingOperationDataSourceTest.m
  59. +17 −0 Tests/Logic/ObjectMapping/RKAttributeMappingTest.m
  60. +13 −0 Tests/Logic/ObjectMapping/RKObjectMappingTest.m
  61. +6 −4 Tests/README.md
  62. +1 −1  Tests/RKTestEnvironment.m
  63. +1 −1  VERSION
  64. +0 −1  Vendor/AFNetworking
  65. +0 −1  Vendor/ISO8601DateFormatterValueTransformer
  66. +5 −5 Vendor/LibComponentLogging/Core/README.md
  67. +3 −1 Vendor/LibComponentLogging/Core/lcl_RK.h
  68. +3 −3 Vendor/LibComponentLogging/Core/lcl_RK.m
  69. +0 −1  Vendor/RKValueTransformers
  70. +0 −1  Vendor/SOCKit
  71. +0 −1  Vendor/TransitionKit
View
1  .gitignore
@@ -33,3 +33,4 @@ DerivedData
# Bundler binstubs
.bundle
bin
+RestKit.xcscmblueprint
View
15 .gitmodules
@@ -1,15 +0,0 @@
-[submodule "Vendor/AFNetworking"]
- path = Vendor/AFNetworking
- url = https://github.com/AFNetworking/AFNetworking.git
-[submodule "Vendor/TransitionKit"]
- path = Vendor/TransitionKit
- url = https://github.com/blakewatters/TransitionKit.git
-[submodule "Vendor/RKValueTransformers"]
- path = Vendor/RKValueTransformers
- url = https://github.com/RestKit/RKValueTransformers.git
-[submodule "Vendor/ISO8601DateFormatterValueTransformer"]
- path = Vendor/ISO8601DateFormatterValueTransformer
- url = https://github.com/blakewatters/ISO8601DateFormatterValueTransformer.git
-[submodule "Vendor/SOCKit"]
- path = Vendor/SOCKit
- url = https://github.com/NimbusKit/sockit.git
View
2  .ruby-version
@@ -1 +1 @@
-2.2.1
+2.2.2
View
2  .travis.yml
@@ -1,5 +1,5 @@
language: objective-c
-rvm: 2.2.1
+rvm: 2.2.2
install:
- bundle install
- bundle exec pod install
View
2  CONTRIBUTING.md
@@ -1,6 +1,6 @@
## Issues
-GitHub Issues is for reporting bugs in RestKit and discussing changes to RestKit itself. Please check the [documentation](http://cocoadocs.org/docsets/RestKit/), [wiki](https://github.com/RestKit/RestKit/wiki), and [existing issues](https://github.com/RestKit/RestKit/issues?state=closed) before opening a new issue.
+GitHub Issues is for reporting bugs in RestKit and discussing changes to RestKit itself. Please check the [documentation](http://cocoadocs.org/docsets/RestKit/), [wiki](https://github.com/RestKit/RestKit/wiki), and [existing issues](https://github.com/RestKit/RestKit/issues?q=is:issue) before opening a new issue.
Additionaly, please do not post general usage questions to Issues, but instead take them to [Stack Overflow](http://stackoverflow.com/questions/tagged/restkit).
View
7 Code/CoreData/RKEntityMapping.h
@@ -115,6 +115,13 @@
@property (nonatomic, copy) NSPredicate *identificationPredicate;
/**
+ An optional block which returns a predicate used to filter identified objects during mapping.
+
+ @return The identification predicate block.
+ */
+@property (nonatomic, copy) NSPredicate *(^identificationPredicateBlock)(NSDictionary *representation, NSManagedObjectContext *managedObjectContext);
+
+/**
An optional attribute of the receiver's entity that can be used to detect modification of a given instance. This is used to improve the performance of mapping operations by skipping the property mappings for a given object if it is found to be not modified.
A common modification attribute is a 'last modified' or 'updated at' timestamp that specifies the timestamp of the last change to an object. When the `modificationAttribute` is non-nil, the mapper will compare the value returned of the attribute on an existing object instance with the value in the representation being mapped.
View
1  Code/CoreData/RKEntityMapping.m
@@ -190,6 +190,7 @@ - (id)copyWithZone:(NSZone *)zone
copy.entity = self.entity;
copy.identificationAttributes = self.identificationAttributes;
copy.identificationPredicate = self.identificationPredicate;
+ copy.identificationPredicateBlock = self.identificationPredicateBlock;
copy.deletionPredicate = self.deletionPredicate;
copy.modificationAttribute = self.modificationAttribute;
copy.mutableConnections = [NSMutableArray array];
View
10 Code/CoreData/RKManagedObjectMappingOperationDataSource.m
@@ -253,7 +253,11 @@ - (id)mappingOperation:(RKMappingOperation *)mappingOperation targetObjectForRep
if (existingObjectsOfRelationship && !RKObjectIsCollection(existingObjectsOfRelationship)) existingObjectsOfRelationship = @[ existingObjectsOfRelationship ];
NSSet *setWithNull = [NSSet setWithObject:[NSNull null]];
for (NSManagedObject *existingObject in existingObjectsOfRelationship) {
- if (! identificationAttributes && ![existingObject isDeleted]) {
+ if(existingObject.isDeleted) {
+ continue;
+ }
+
+ if (!identificationAttributes) {
managedObject = existingObject;
[existingObjectsOfRelationship removeObject:managedObject];
break;
@@ -273,6 +277,10 @@ - (id)mappingOperation:(RKMappingOperation *)mappingOperation targetObjectForRep
attributeValues:entityIdentifierAttributes
inManagedObjectContext:self.managedObjectContext];
if (entityMapping.identificationPredicate) objects = [objects filteredSetUsingPredicate:entityMapping.identificationPredicate];
+ if (entityMapping.identificationPredicateBlock) {
+ NSPredicate *predicate = entityMapping.identificationPredicateBlock(representation, self.managedObjectContext);
+ if (predicate) objects = [objects filteredSetUsingPredicate:predicate];
+ }
if ([objects count] > 0) {
managedObject = [objects anyObject];
if ([objects count] > 1) RKLogWarning(@"Managed object cache returned %ld objects for the identifier configured for the '%@' entity, expected 1.", (long) [objects count], [entity name]);
View
25 Code/CoreData/RKManagedObjectStore.m
@@ -103,6 +103,31 @@ - (void)handleManagedObjectContextDidSaveNotification:(NSNotification *)notifica
NSAssert([notification object] == self.observedContext, @"Received Managed Object Context Did Save Notification for Unexpected Context: %@", [notification object]);
if (! [self.objectIDsFromChildDidSaveNotification isEqual:RKSetOfManagedObjectIDsFromManagedObjectContextDidSaveNotification(notification)]) {
[self.mergeContext performBlock:^{
+
+ /*
+ Fault updated objects before merging changes into mainQueueManagedObjectContext.
+
+ This enables NSFetchedResultsController to update and re-sort its fetch results and to call its delegate methods
+ in response Managed Object updates merged from another context.
+ See:
+ http://stackoverflow.com/a/3927811/489376
+ http://stackoverflow.com/a/16296365/489376
+ for issue details.
+ */
+ for (NSManagedObject *object in [[notification userInfo] objectForKey:NSUpdatedObjectsKey]) {
+ NSManagedObjectID *objectID = [object objectID];
+ if (objectID && ![objectID isTemporaryID]) {
+ NSError *error = nil;
+ NSManagedObject * updatedObject = [self.mergeContext existingObjectWithID:objectID error:&error];
+ if (error) {
+ RKLogDebug(@"Failed to get existing object for objectID (%@). Failed with error: %@", objectID, error);
+ }
+ else {
+ [updatedObject willAccessValueForKey:nil];
+ }
+ }
+ }
+
[self.mergeContext mergeChangesFromContextDidSaveNotification:notification];
}];
} else {
View
23 Code/CoreData/RKRelationshipConnectionOperation.m
@@ -148,7 +148,14 @@ - (id)findConnectedValueForConnection:(RKConnectionDescription *)connection shou
{
*shouldConnectRelationship = YES;
id connectionResult = nil;
- if (connection.sourcePredicate && ![connection.sourcePredicate evaluateWithObject:self.managedObject]) return nil;
+ if (connection.sourcePredicate) {
+ __block BOOL evaluationResult;
+ [self.managedObject.managedObjectContext performBlockAndWait:^{
+ evaluationResult = [connection.sourcePredicate evaluateWithObject:self.managedObject];
+ }];
+
+ if (!evaluationResult) return nil;
+ }
if ([connection isForeignKeyConnection]) {
NSDictionary *attributeValues = RKConnectionAttributeValuesWithObject(connection, self.managedObject);
@@ -157,11 +164,15 @@ - (id)findConnectedValueForConnection:(RKConnectionDescription *)connection shou
*shouldConnectRelationship = NO;
return nil;
}
- NSSet *managedObjects = [self.managedObjectCache managedObjectsWithEntity:[connection.relationship destinationEntity]
- attributeValues:attributeValues
- inManagedObjectContext:self.managedObjectContext];
- if (connection.destinationPredicate) managedObjects = [managedObjects filteredSetUsingPredicate:connection.destinationPredicate];
- if (!connection.includesSubentities) managedObjects = [managedObjects filteredSetUsingPredicate:[NSPredicate predicateWithFormat:@"entity == %@", [connection.relationship destinationEntity]]];
+ __block NSSet *managedObjects = [self.managedObjectCache managedObjectsWithEntity:[connection.relationship destinationEntity]
+ attributeValues:attributeValues
+ inManagedObjectContext:self.managedObjectContext];
+
+ [self.managedObjectContext performBlockAndWait:^{
+ if (connection.destinationPredicate) managedObjects = [managedObjects filteredSetUsingPredicate:connection.destinationPredicate];
+ if (!connection.includesSubentities) managedObjects = [managedObjects filteredSetUsingPredicate:[NSPredicate predicateWithFormat:@"entity == %@", [connection.relationship destinationEntity]]];
+ }];
+
if ([connection.relationship isToMany]) {
connectionResult = managedObjects;
} else {
View
4 Code/Network/RKHTTPRequestOperation.h
@@ -18,8 +18,8 @@
// limitations under the License.
//
-#import "AFHTTPClient.h"
-#import "AFHTTPRequestOperation.h"
+#import <AFNetworking/AFHTTPClient.h>
+#import <AFNetworking/AFHTTPRequestOperation.h>
// Expose the default headers from AFNetworking's AFHTTPClient
@interface AFHTTPClient ()
View
43 Code/Network/RKManagedObjectRequestOperation.m
@@ -335,22 +335,22 @@ - (RKMappingResult *)refetchedMappingResult
return URL;
}
-static NSSet *RKGatherManagedObjectsFromObjectWithRelationshipMapping(id object, RKRelationshipMapping *relationshipMapping)
+static void RKGatherManagedObjectsFromObjectWithRelationshipMapping(id object, RKRelationshipMapping *relationshipMapping, NSMutableSet *managedObjects)
{
- NSMutableSet *managedObjects = [NSMutableSet set];
NSSet *relationshipValue = RKFlattenCollectionToSet([object valueForKeyPath:relationshipMapping.destinationKeyPath]);
for (id relatedObject in relationshipValue) {
+ if ([managedObjects containsObject:relatedObject]) continue;
if ([relatedObject isKindOfClass:[NSManagedObject class]]) [managedObjects addObject:relatedObject];
-
+
if ([relationshipMapping.mapping isKindOfClass:[RKObjectMapping class]]) {
for (RKRelationshipMapping *childRelationshipMapping in [(RKObjectMapping *)relationshipMapping.mapping relationshipMappings]) {
- [managedObjects unionSet:RKGatherManagedObjectsFromObjectWithRelationshipMapping(relatedObject, childRelationshipMapping)];
+ RKGatherManagedObjectsFromObjectWithRelationshipMapping(relatedObject, childRelationshipMapping, managedObjects);
}
} else if ([relationshipMapping.mapping isKindOfClass:[RKDynamicMapping class]]) {
for (RKObjectMapping *objectMapping in [(RKDynamicMapping *)relationshipMapping.mapping objectMappings]) {
@try {
for (RKRelationshipMapping *childRelationshipMapping in objectMapping.relationshipMappings) {
- [managedObjects unionSet:RKGatherManagedObjectsFromObjectWithRelationshipMapping(relatedObject, childRelationshipMapping)];
+ RKGatherManagedObjectsFromObjectWithRelationshipMapping(relatedObject, childRelationshipMapping, managedObjects);
}
}
@catch (NSException *exception) {
@@ -359,7 +359,6 @@ - (RKMappingResult *)refetchedMappingResult
}
}
}
- return managedObjects;
}
static NSSet *RKManagedObjectsFromObjectWithMappingInfo(id object, RKMappingInfo *mappingInfo)
@@ -373,15 +372,32 @@ - (RKMappingResult *)refetchedMappingResult
if ([[mappingInfo propertyMappings] count] == 0) {
// This object was matched, but no changes were made. Gather all related objects
for (RKRelationshipMapping *relationshipMapping in [mappingInfo.objectMapping relationshipMappings]) {
- [managedObjects unionSet:RKGatherManagedObjectsFromObjectWithRelationshipMapping(object, relationshipMapping)];
+ RKGatherManagedObjectsFromObjectWithRelationshipMapping(object, relationshipMapping, managedObjects);
}
- } else {
+ } else {
for (NSString *destinationKeyPath in mappingInfo.relationshipMappingInfo) {
- id relationshipValue = [object valueForKeyPath:destinationKeyPath];
+ id relationshipValue = nil;
+ // Objects in collection may have different types, so destination keypath may be not applicable to each of them
+ if([object conformsToProtocol:@protocol(NSFastEnumeration)]) {
+ NSMutableSet* results = [NSMutableSet set];
+ for (id item in object) {
+ @try {
+ id value = [item valueForKeyPath:destinationKeyPath];
+ [results addObject:value];
+ } @catch(NSException*) {
+ continue;
+ }
+ }
+
+ relationshipValue = results;
+ } else {
+ relationshipValue = [object valueForKeyPath:destinationKeyPath];
+ }
+
NSArray *mappingInfos = (mappingInfo.relationshipMappingInfo)[destinationKeyPath];
for (RKMappingInfo *relationshipMappingInfo in mappingInfos) {
NSUInteger index = [mappingInfos indexOfObject:relationshipMappingInfo];
- id mappedObjectAtIndex = ([relationshipValue respondsToSelector:@selector(objectAtIndex:)]) ? [NSSet setWithObject:relationshipValue[index]] : relationshipValue;
+ id mappedObjectAtIndex = ([relationshipValue respondsToSelector:@selector(objectAtIndex:)]) ? relationshipValue[index] : relationshipValue;
[managedObjects unionSet:RKFlattenCollectionToSet(RKManagedObjectsFromObjectWithMappingInfo(mappedObjectAtIndex, relationshipMappingInfo))];
}
}
@@ -400,7 +416,7 @@ - (RKMappingResult *)refetchedMappingResult
id objectsAtRoot = mappingResultDictionary[rootKey];
for (RKMappingInfo *mappingInfo in mappingInfoArray) {
NSUInteger index = [mappingInfoArray indexOfObject:mappingInfo];
- id mappedObjectAtIndex = ([objectsAtRoot respondsToSelector:@selector(objectAtIndex:)]) ? [NSSet setWithObject:objectsAtRoot[index]] : objectsAtRoot;
+ id mappedObjectAtIndex = ([objectsAtRoot respondsToSelector:@selector(objectAtIndex:)]) ? objectsAtRoot[index] : objectsAtRoot;
NSSet *managedObjects = RKManagedObjectsFromObjectWithMappingInfo(mappedObjectAtIndex, mappingInfo);
if (managedObjects) {
@@ -733,7 +749,10 @@ - (BOOL)deleteLocalObjectsMissingFromMappingResult:(RKMappingResult *)mappingRes
if (! [fetchRequests count]) return YES;
// Proceed with cleanup
- NSSet *managedObjectsInMappingResult = RKManagedObjectsFromMappingResultWithMappingInfo(mappingResult, self.mappingInfo) ?: [NSSet set];
+ __block NSSet *managedObjectsInMappingResult;
+ [self.privateContext performBlockAndWait:^{
+ managedObjectsInMappingResult = RKManagedObjectsFromMappingResultWithMappingInfo(mappingResult, self.mappingInfo) ?: [NSSet set];
+ }];
NSSet *localObjects = [self localObjectsFromFetchRequests:fetchRequests matchingRequestURL:error];
if (! localObjects) {
RKLogError(@"Failed when attempting to fetch local candidate objects for orphan cleanup: %@", error ? *error : nil);
View
9 Code/Network/RKObjectManager.h
@@ -21,12 +21,13 @@
#import "RKRouter.h"
#import "RKPaginator.h"
#import "RKMacros.h"
-#import "AFNetworking.h"
+
+#import <AFNetworking/AFNetworking.h>
#ifdef _COREDATADEFINES_H
-#if __has_include("RKCoreData.h")
-#define RKCoreDataIncluded
-#endif
+# if __has_include("RKCoreData.h")
+# define RKCoreDataIncluded
+# endif
#endif
@protocol RKSerialization;
View
14 Code/Network/RKObjectManager.m
@@ -38,16 +38,16 @@
#import "RKRouteSet.h"
#ifdef _COREDATADEFINES_H
-#if __has_include("RKCoreData.h")
-#define RKCoreDataIncluded
-#import "RKManagedObjectStore.h"
-#import "RKManagedObjectRequestOperation.h"
-#endif
+# if __has_include("RKCoreData.h")
+# define RKCoreDataIncluded
+# import "RKManagedObjectStore.h"
+# import "RKManagedObjectRequestOperation.h"
+# endif
#endif
#if !__has_feature(objc_arc)
-#error RestKit must be built with ARC.
-// You can turn on ARC for only RestKit files by adding "-fobjc-arc" to the build phase for each of its files.
+#error RestKit must be built with ARC. \
+You can turn on ARC for only RestKit files by adding "-fobjc-arc" to the build phase for each of its files.
#endif
//////////////////////////////////
View
10 Code/Network/RKResponseMapperOperation.m
@@ -311,10 +311,12 @@ - (void)willFinish
{
if (self.isCancelled && !self.error) self.error = [NSError errorWithDomain:RKErrorDomain code:RKOperationCancelledError userInfo:@{ NSLocalizedDescriptionKey: @"The operation was cancelled." }];
- if (self.didFinishMappingBlock) {
- if (self.error) self.didFinishMappingBlock(nil, self.error);
- else self.didFinishMappingBlock(self.mappingResult, nil);
- [self setDidFinishMappingBlock:nil];
+ @synchronized(self) {
+ if (self.didFinishMappingBlock) {
+ if (self.error) self.didFinishMappingBlock(nil, self.error);
+ else self.didFinishMappingBlock(self.mappingResult, nil);
+ [self setDidFinishMappingBlock:nil];
+ }
}
}
View
3  Code/ObjectMapping.h
@@ -18,10 +18,11 @@
// limitations under the License.
//
+#import <RKValueTransformers/RKValueTransformers.h>
+
#import "RKObjectMapping.h"
#import "RKAttributeMapping.h"
#import "RKRelationshipMapping.h"
-#import "RKValueTransformers.h"
#import "RKMappingResult.h"
#import "RKMapperOperation.h"
#import "RKDynamicMapping.h"
View
29 Code/ObjectMapping/RKHTTPUtilities.m
@@ -344,8 +344,13 @@ RKRequestMethod RKRequestMethodFromString(NSString *methodName)
int parsed = 0, cs = 1;
NSDate *date = NULL;
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED < 70000)) || \
+(defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9))
CFGregorianDate gdate;
memset(&gdate, 0, sizeof(CFGregorianDate));
+#else
+ NSDateComponents *gdate = [[NSDateComponents alloc] init];
+#endif
{
int _slen, _trans;
@@ -397,11 +402,29 @@ RKRequestMethod RKRequestMethodFromString(NSString *methodName)
_out: {}
}
- static CFTimeZoneRef gmtTimeZone;
static dispatch_once_t onceToken;
- dispatch_once(&onceToken, ^{ gmtTimeZone = CFTimeZoneCreateWithTimeIntervalFromGMT(NULL, 0.0); });
- if(parsed == 1) { date = [NSDate dateWithTimeIntervalSinceReferenceDate:CFGregorianDateGetAbsoluteTime(gdate, gmtTimeZone)]; }
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED < 70000)) || \
+(defined(MAC_OS_X_VERSION_MAX_ALLOWED) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9))
+ static CFTimeZoneRef gmtTimeZone;
+ dispatch_once(&onceToken, ^{
+ gmtTimeZone = CFTimeZoneCreateWithTimeIntervalFromGMT(NULL, 0.0);
+ });
+
+ if (parsed == 1) {
+ date = [NSDate dateWithTimeIntervalSinceReferenceDate:CFGregorianDateGetAbsoluteTime(gdate, gmtTimeZone)];
+ }
+#else
+ static NSCalendar *gregorian;
+ dispatch_once(&onceToken, ^{
+ gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+ gregorian.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
+ });
+
+ if (parsed == 1) {
+ date = [gregorian dateFromComponents:gdate];
+ }
+#endif
return(date);
}
View
9 Code/ObjectMapping/RKMappingOperation.m
@@ -853,6 +853,11 @@ - (BOOL)mapOneToOneRelationshipWithValue:(id)value mapping:(RKRelationshipMappin
self.error = [NSError errorWithDomain:RKErrorDomain code:RKMappingErrorInvalidAssignmentPolicy userInfo:userInfo];
return NO;
}
+
+ // Remove existing destination entity before mapping the new one
+ if (relationshipMapping.assignmentPolicy == RKAssignmentPolicyReplace && ![self applyReplaceAssignmentPolicyForRelationshipMapping:relationshipMapping]) {
+ return NO;
+ }
id parentSourceObject = [self parentObjectForRelationshipMapping:relationshipMapping];
id destinationObject = [self destinationObjectForMappingRepresentation:value parentRepresentation:parentSourceObject withMapping:relationshipMapping.mapping inRelationship:relationshipMapping];
@@ -866,10 +871,6 @@ - (BOOL)mapOneToOneRelationshipWithValue:(id)value mapping:(RKRelationshipMappin
// If the relationship has changed, set it
if ([self shouldSetValue:&destinationObject forKeyPath:destinationKeyPath usingMapping:relationshipMapping]) {
- if (! [self applyReplaceAssignmentPolicyForRelationshipMapping:relationshipMapping]) {
- return NO;
- }
-
RKLogTrace(@"Mapped relationship object from keyPath '%@' to '%@'. Value: %@", relationshipMapping.sourceKeyPath, destinationKeyPath, destinationObject);
[self.destinationObject setValue:destinationObject forKeyPath:destinationKeyPath];
} else {
View
3  Code/ObjectMapping/RKObjectMapping.h
@@ -20,7 +20,8 @@
#import "RKMacros.h"
#import "RKMapping.h"
-#import "RKValueTransformers.h"
+
+#import <RKValueTransformers/RKValueTransformers.h>
@class RKPropertyMapping, RKAttributeMapping, RKRelationshipMapping;
@protocol RKValueTransforming;
View
2  Code/ObjectMapping/RKObjectMapping.m
@@ -365,7 +365,7 @@ - (void)removePropertyMapping:(RKPropertyMapping *)attributeOrRelationshipMappin
self.keyAttributeMappings = RKRemoveProperty(self.keyAttributeMappings, attributeOrRelationshipMapping);
self.keyPathAttributeMappings = RKRemoveProperty(self.keyPathAttributeMappings, attributeOrRelationshipMapping);
[self.propertiesBySourceKeyPath removeObjectForKey:attributeOrRelationshipMapping.sourceKeyPath ?: [NSNull null]];
- [self.propertiesByDestinationKeyPath removeObjectForKey:attributeOrRelationshipMapping.destinationKeyPath];
+ [self.propertiesByDestinationKeyPath removeObjectForKey:attributeOrRelationshipMapping.destinationKeyPath ?: [NSNull null]];
}
}
View
2  Code/ObjectMapping/RKPropertyMapping.m
@@ -44,6 +44,8 @@ - (id)copyWithZone:(NSZone *)zone
RKPropertyMapping *copy = [[[self class] allocWithZone:zone] init];
copy.sourceKeyPath = self.sourceKeyPath;
copy.destinationKeyPath = self.destinationKeyPath;
+ copy.propertyValueClass = self.propertyValueClass;
+ copy.valueTransformer = self.valueTransformer;
return copy;
}
View
7 Code/Support/RKLumberjackLogger.m
@@ -75,7 +75,7 @@ + (void)logWithComponent:(_RKlcl_component_t)component
[DDLog log:async
level:componentLevel
flag:flag
- context:0 /* Could define a special value here to identify RestKit logs to any backend loggers */
+ context:0x524B5F00 + component
file:path function:function line:line
tag:nil
format:format args:args];
@@ -86,6 +86,8 @@ + (void)logWithComponent:(_RKlcl_component_t)component
/* Create a DDRegisteredDynamicLogging class for each RestKit component */
+#import "lcl_config_components_RK.h"
+
#undef _RKlcl_component
#define _RKlcl_component(_identifier, _header, _name) \
@interface RKLumberjackLog##_identifier : NSObject <DDRegisteredDynamicLogging> \
@@ -100,7 +102,8 @@ + (void)ddSetLogLevel:(int)logLevel {
} \
@end
-#include "lcl_config_components_RK.h"
+RKLCLComponentDefinitions
+
#undef _RKlcl_component
View
5 Code/Support/RestKit-Prefix.pch
@@ -5,6 +5,11 @@
#ifdef __OBJC__
#import <Foundation/Foundation.h>
+// Fix for compilation on iOS 6 where this is not defined.
+#if !defined NS_DESIGNATED_INITIALIZER
+#define NS_DESIGNATED_INITIALIZER
+#endif
+
#import <Availability.h>
#if __IPHONE_OS_VERSION_MIN_REQUIRED
#import <SystemConfiguration/SystemConfiguration.h>
View
21 Code/Support/lcl_config_components_RK.h
@@ -49,14 +49,15 @@
// RestKit Logging Components
//
-_RKlcl_component(App, "app", "App")
-_RKlcl_component(RestKit, "restkit", "RestKit")
-_RKlcl_component(RestKitCoreData, "restkit.core_data", "RestKit/CoreData")
-_RKlcl_component(RestKitCoreDataCache, "restkit.core_data.cache", "RestKit/CoreData/Cache")
-_RKlcl_component(RestKitNetwork, "restkit.network", "RestKit/Network")
-_RKlcl_component(RestKitNetworkCoreData, "restkit.network.core_data", "RestKit/Network/CoreData")
-_RKlcl_component(RestKitObjectMapping, "restkit.object_mapping", "RestKit/ObjectMapping")
-_RKlcl_component(RestKitSearch, "restkit.search", "RestKit/Search")
-_RKlcl_component(RestKitSupport, "restkit.support", "RestKit/Support")
-_RKlcl_component(RestKitTesting, "restkit.testing", "RestKit/Testing")
+#define RKLCLComponentDefinitions \
+_RKlcl_component(App, "app", "App") \
+_RKlcl_component(RestKit, "restkit", "RestKit") \
+_RKlcl_component(RestKitCoreData, "restkit.core_data", "RestKit/CoreData") \
+_RKlcl_component(RestKitCoreDataCache, "restkit.core_data.cache", "RestKit/CoreData/Cache") \
+_RKlcl_component(RestKitNetwork, "restkit.network", "RestKit/Network") \
+_RKlcl_component(RestKitNetworkCoreData, "restkit.network.core_data", "RestKit/Network/CoreData") \
+_RKlcl_component(RestKitObjectMapping, "restkit.object_mapping", "RestKit/ObjectMapping") \
+_RKlcl_component(RestKitSearch, "restkit.search", "RestKit/Search") \
+_RKlcl_component(RestKitSupport, "restkit.support", "RestKit/Support") \
+_RKlcl_component(RestKitTesting, "restkit.testing", "RestKit/Testing") \
_RKlcl_component(RestKitUI, "restkit.ui", "RestKit/UI")
View
4 Docs/MobileTuts Advanced RestKit/Advanced_RestKit_Tutorial.md
@@ -717,7 +717,7 @@ We hope that you have found learning about RestKit fun and rewarding. At this po
## Learning More
* RestKit: [http://restkit.org]()
-* Github: [https://github.com/twotoasters/RestKit]()
-* API Docs: [http://restkit.org/api/]()
+* Github: [https://github.com/RestKit/RestKit]()
+* API Docs: [http://cocoadocs.org/docsets/RestKit/]()
* Google Group: [http://groups.google.com/group/restkit]()
* Brought to you by Two Toasters: [http://twotoasters.com/]()
View
2  Docs/MobileTuts Introduction to RestKit/index.html
@@ -381,7 +381,7 @@ <h2 id="learningmore">Learning More</h2>
<ul>
<li><a href="http://restkit.org">RestKit.org</a></li>
-<li><a href="https://github.com/twotoasters/RestKit">Github Project Page</a></li>
+<li><a href="https://github.com/RestKit/RestKit">Github Project Page</a></li>
<li><a href="http://groups.google.com/group/restkit">Official Google Group</a></li>
<li><a href="http://twotoasters.com/">Two Toasters</a></li>
</ul>
View
6 Docs/WRITING_DOCS.md
@@ -1,7 +1,7 @@
Writing Documentation
=====================
-RestKit utilizes the excellent [Appledoc](http://www.gentlebytes.com/home/appledocapp/) utility from [Gentle Bytes](http://www.gentlebytes.com/).
+RestKit utilizes the excellent [Appledoc](http://www.gentlebytes.com/appledoc/) utility from [Gentle Bytes](http://www.gentlebytes.com/).
Appledoc provides a commandline utility for parsing and generating documentation from Objective-C code in HTML and DocSet format. This HTML can be
published to the Web and installed directly within Xcode.
@@ -21,7 +21,7 @@ The tasks available for working with Appledoc are:
## Writing Documentation
-Writing documentation in Appledoc markup is simple. There is extensive documentation available on the [Appledoc project page](http://tomaz.github.com/appledoc/comments.html), but
+Writing documentation in Appledoc markup is simple. There is extensive documentation available on the [Appledoc project page](https://github.com/tomaz/appledoc), but
the guidelines below should be sufficient for basic authoring tasks. For clarity, let's consider the following example class:
/**
@@ -107,6 +107,6 @@ If you want to contribute documentation, the process is simple:
1. Edit the headers in Code/ and regenerate the docs via `rake docs`
1. Repeat the editing and reload cycle until your are happy.
1. Commit the code and push to Github
-1. Submit a Pull Request to the RestKit repository on Github at: https://github.com/RestKit/RestKit/pull/new/master
+1. Submit a Pull Request to the RestKit repository on Github at: https://github.com/RestKit/RestKit/compare
You may want to coordinate your efforts via the mailing list to ensure nobody else is working on documentation in the same place.
View
4 Examples/RKMacOSX/Podfile
@@ -0,0 +1,4 @@
+# Install via CocoaPods pointing at current local codebase
+pod 'RestKit/Network', :path => '../../'
+pod 'RestKit/ObjectMapping', :path => '../../'
+pod 'RestKit/CoreData', :path => '../../'
View
169 Examples/RKMacOSX/RKMacOSX.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
- 250DF24F14C67F560001DEFA /* RestKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 250DF24B14C67E9A0001DEFA /* RestKit.framework */; };
+ 1CE1DD3E5F2FE7DA177F56EF /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A28BE5513E3B77C342497A9E /* libPods.a */; };
25D63919135184CE000879B1 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25D63918135184CE000879B1 /* Cocoa.framework */; };
25D63923135184CE000879B1 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 25D63921135184CE000879B1 /* InfoPlist.strings */; };
25D63926135184CE000879B1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 25D63925135184CE000879B1 /* main.m */; };
@@ -19,44 +19,6 @@
25D63983135185B6000879B1 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25D63982135185B6000879B1 /* SystemConfiguration.framework */; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 250DF24614C67E9A0001DEFA /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 25D63938135184F0000879B1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D1614564E810060A5C5;
- remoteInfo = RestKit;
- };
- 250DF24814C67E9A0001DEFA /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 25D63938135184F0000879B1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D2614564E820060A5C5;
- remoteInfo = RestKitTests;
- };
- 250DF24A14C67E9A0001DEFA /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 25D63938135184F0000879B1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E62145651060060A5C5;
- remoteInfo = RestKitFramework;
- };
- 250DF24C14C67E9A0001DEFA /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 25D63938135184F0000879B1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E78145651060060A5C5;
- remoteInfo = RestKitFrameworkTests;
- };
- 250DF25014C67F630001DEFA /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 25D63938135184F0000879B1 /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 25160E61145651060060A5C5;
- remoteInfo = RestKitFramework;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXFileReference section */
25D63914135184CE000879B1 /* RKMacOSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RKMacOSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
25D63918135184CE000879B1 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -71,10 +33,12 @@
25D6392A135184CE000879B1 /* RKMacOSXAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RKMacOSXAppDelegate.h; sourceTree = "<group>"; };
25D6392B135184CE000879B1 /* RKMacOSXAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RKMacOSXAppDelegate.m; sourceTree = "<group>"; };
25D6392E135184CF000879B1 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
- 25D63938135184F0000879B1 /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../../RestKit.xcodeproj; sourceTree = "<group>"; };
25D6397E13518574000879B1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
25D639801351858A000879B1 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
25D63982135185B6000879B1 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+ 663395048EDD9B445E77BF72 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+ A28BE5513E3B77C342497A9E /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ CDF0146ADF834F0317B19719 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -82,11 +46,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 250DF24F14C67F560001DEFA /* RestKit.framework in Frameworks */,
25D63983135185B6000879B1 /* SystemConfiguration.framework in Frameworks */,
25D639811351858A000879B1 /* AppKit.framework in Frameworks */,
25D6397F13518574000879B1 /* CoreData.framework in Frameworks */,
25D63919135184CE000879B1 /* Cocoa.framework in Frameworks */,
+ 1CE1DD3E5F2FE7DA177F56EF /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -97,9 +61,9 @@
isa = PBXGroup;
children = (
25D6391E135184CE000879B1 /* RKMacOSX */,
- 25D639841351868E000879B1 /* RestKit */,
25D63917135184CE000879B1 /* Frameworks */,
25D63915135184CE000879B1 /* Products */,
+ F73078E151260A102FEB82F9 /* Pods */,
);
sourceTree = "<group>";
};
@@ -119,6 +83,7 @@
25D6397E13518574000879B1 /* CoreData.framework */,
25D63918135184CE000879B1 /* Cocoa.framework */,
25D6391A135184CE000879B1 /* Other Frameworks */,
+ A28BE5513E3B77C342497A9E /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -156,23 +121,13 @@
name = "Supporting Files";
sourceTree = "<group>";
};
- 25D63939135184F0000879B1 /* Products */ = {
+ F73078E151260A102FEB82F9 /* Pods */ = {
isa = PBXGroup;
children = (
- 250DF24714C67E9A0001DEFA /* libRestKit.a */,
- 250DF24914C67E9A0001DEFA /* RestKitTests.xctest */,
- 250DF24B14C67E9A0001DEFA /* RestKit.framework */,
- 250DF24D14C67E9A0001DEFA /* RestKitFrameworkTests.xctest */,
+ 663395048EDD9B445E77BF72 /* Pods.debug.xcconfig */,
+ CDF0146ADF834F0317B19719 /* Pods.release.xcconfig */,
);
- name = Products;
- sourceTree = "<group>";
- };
- 25D639841351868E000879B1 /* RestKit */ = {
- isa = PBXGroup;
- children = (
- 25D63938135184F0000879B1 /* RestKit.xcodeproj */,
- );
- name = RestKit;
+ name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */
@@ -182,14 +137,15 @@
isa = PBXNativeTarget;
buildConfigurationList = 25D63935135184CF000879B1 /* Build configuration list for PBXNativeTarget "RKMacOSX" */;
buildPhases = (
+ 0E7867D148FBAD64B7DE1EB6 /* Check Pods Manifest.lock */,
25D63910135184CE000879B1 /* Sources */,
25D63911135184CE000879B1 /* Frameworks */,
25D63912135184CE000879B1 /* Resources */,
+ E02916F51F1155DFDAB83400 /* Copy Pods Resources */,
);
buildRules = (
);
dependencies = (
- 250DF25114C67F630001DEFA /* PBXTargetDependency */,
);
name = RKMacOSX;
productName = RKMacOSX;
@@ -202,7 +158,7 @@
25D6390B135184CE000879B1 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0620;
+ LastUpgradeCheck = 0700;
};
buildConfigurationList = 25D6390E135184CE000879B1 /* Build configuration list for PBXProject "RKMacOSX" */;
compatibilityVersion = "Xcode 3.2";
@@ -214,12 +170,6 @@
mainGroup = 25D63909135184CE000879B1;
productRefGroup = 25D63915135184CE000879B1 /* Products */;
projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = 25D63939135184F0000879B1 /* Products */;
- ProjectRef = 25D63938135184F0000879B1 /* RestKit.xcodeproj */;
- },
- );
projectRoot = "";
targets = (
25D63913135184CE000879B1 /* RKMacOSX */,
@@ -227,37 +177,6 @@
};
/* End PBXProject section */
-/* Begin PBXReferenceProxy section */
- 250DF24714C67E9A0001DEFA /* libRestKit.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKit.a;
- remoteRef = 250DF24614C67E9A0001DEFA /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 250DF24914C67E9A0001DEFA /* RestKitTests.xctest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = RestKitTests.xctest;
- remoteRef = 250DF24814C67E9A0001DEFA /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 250DF24B14C67E9A0001DEFA /* RestKit.framework */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.framework;
- path = RestKit.framework;
- remoteRef = 250DF24A14C67E9A0001DEFA /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 250DF24D14C67E9A0001DEFA /* RestKitFrameworkTests.xctest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = RestKitFrameworkTests.xctest;
- remoteRef = 250DF24C14C67E9A0001DEFA /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
/* Begin PBXResourcesBuildPhase section */
25D63912135184CE000879B1 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -271,6 +190,39 @@
};
/* End PBXResourcesBuildPhase section */
+/* Begin PBXShellScriptBuildPhase section */
+ 0E7867D148FBAD64B7DE1EB6 /* Check Pods Manifest.lock */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Check Pods Manifest.lock";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
+ showEnvVarsInLog = 0;
+ };
+ E02916F51F1155DFDAB83400 /* Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Copy Pods Resources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
+/* End PBXShellScriptBuildPhase section */
+
/* Begin PBXSourcesBuildPhase section */
25D63910135184CE000879B1 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -283,14 +235,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 250DF25114C67F630001DEFA /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = RestKitFramework;
- targetProxy = 250DF25014C67F630001DEFA /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
25D63921135184CE000879B1 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
@@ -330,7 +274,9 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -360,6 +306,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -375,6 +322,7 @@
};
25D63936135184CF000879B1 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 663395048EDD9B445E77BF72 /* Pods.debug.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
@@ -384,14 +332,9 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RKMacOSX/RKMacOSX-Prefix.pch";
- HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"";
INFOPLIST_FILE = "RKMacOSX/RKMacOSX-Info.plist";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)\"",
- );
MACOSX_DEPLOYMENT_TARGET = 10.7;
- OTHER_LDFLAGS = "-ObjC";
+ PRODUCT_BUNDLE_IDENTIFIER = "com.twotoasters.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -399,6 +342,7 @@
};
25D63937135184CF000879B1 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = CDF0146ADF834F0317B19719 /* Pods.release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
@@ -408,14 +352,9 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RKMacOSX/RKMacOSX-Prefix.pch";
- HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"";
INFOPLIST_FILE = "RKMacOSX/RKMacOSX-Info.plist";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)\"",
- );
MACOSX_DEPLOYMENT_TARGET = 10.7;
- OTHER_LDFLAGS = "-ObjC";
+ PRODUCT_BUNDLE_IDENTIFIER = "com.twotoasters.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
View
2  Examples/RKMacOSX/RKMacOSX/RKMacOSX-Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.twotoasters.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
View
7 Examples/RKSearchExample/Podfile
@@ -0,0 +1,7 @@
+platform :ios, '8.0'
+use_frameworks!
+
+# Install via CocoaPods pointing at current local codebase
+pod 'RestKit/Network', :path => '../../'
+pod 'RestKit/ObjectMapping', :path => '../../'
+pod 'RestKit/Search', :path => '../../'
View
179 Examples/RKSearchExample/RKSearchExample.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
259C800B15D20B5600F447D2 /* RKSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 259C800A15D20B5600F447D2 /* RKSAppDelegate.m */; };
259C800E15D20B5600F447D2 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 259C800C15D20B5600F447D2 /* MainStoryboard.storyboard */; };
259C801115D20B5600F447D2 /* RKSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 259C801015D20B5600F447D2 /* RKSViewController.m */; };
- 259C802E15D20BAA00F447D2 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 259C802315D20B7100F447D2 /* libRestKit.a */; };
259C803415D20BAA00F447D2 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 259C802F15D20BAA00F447D2 /* CFNetwork.framework */; };
259C803515D20BAA00F447D2 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 259C803015D20BAA00F447D2 /* CoreData.framework */; };
259C803615D20BAA00F447D2 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 259C803115D20BAA00F447D2 /* QuartzCore.framework */; };
@@ -26,46 +25,9 @@
259C803C15D20C4000F447D2 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 259C803B15D20C4000F447D2 /* libxml2.dylib */; };
25AA7D1415D4C3A700A1B4E7 /* RKSearchExampleModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 25AA7D1215D4C3A700A1B4E7 /* RKSearchExampleModel.xcdatamodeld */; };
25AABCF017B69B590061DC5B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25AABCEF17B69B590061DC5B /* Default-568h@2x.png */; };
+ 45F73EB9D2311FFAF6C1338B /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F88520F4AEA4E5CA9B38E99 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 259C802215D20B7100F447D2 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 259C801715D20B7100F447D2 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D1614564E810060A5C5;
- remoteInfo = RestKit;
- };
- 259C802415D20B7100F447D2 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 259C801715D20B7100F447D2 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D2614564E820060A5C5;
- remoteInfo = RestKitTests;
- };
- 259C802615D20B7100F447D2 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 259C801715D20B7100F447D2 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E62145651060060A5C5;
- remoteInfo = RestKitFramework;
- };
- 259C802815D20B7100F447D2 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 259C801715D20B7100F447D2 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E78145651060060A5C5;
- remoteInfo = RestKitFrameworkTests;
- };
- 259C802C15D20B7B00F447D2 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 259C801715D20B7100F447D2 /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 25160D1514564E810060A5C5;
- remoteInfo = RestKit;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXFileReference section */
2583C49B15D96D4000E05CAE /* contacts.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = contacts.json; sourceTree = "<group>"; };
259C7FF615D20B5600F447D2 /* RKSearchExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RKSearchExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -81,7 +43,6 @@
259C800D15D20B5600F447D2 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard.storyboard; sourceTree = "<group>"; };
259C800F15D20B5600F447D2 /* RKSViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RKSViewController.h; sourceTree = "<group>"; };
259C801015D20B5600F447D2 /* RKSViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RKSViewController.m; sourceTree = "<group>"; };
- 259C801715D20B7100F447D2 /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../../RestKit.xcodeproj; sourceTree = "<group>"; };
259C802F15D20BAA00F447D2 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
259C803015D20BAA00F447D2 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
259C803115D20BAA00F447D2 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -91,6 +52,9 @@
259C803B15D20C4000F447D2 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
25AA7D1315D4C3A700A1B4E7 /* RKSearchExampleModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = RKSearchExampleModel.xcdatamodel; sourceTree = "<group>"; };
25AABCEF17B69B590061DC5B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+ 4839D63C1F0B427271E84C9B /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+ 5F88520F4AEA4E5CA9B38E99 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 97374605117FDAA6FDA05691 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -105,10 +69,10 @@
259C803615D20BAA00F447D2 /* QuartzCore.framework in Frameworks */,
259C803715D20BAA00F447D2 /* Security.framework in Frameworks */,
259C803815D20BAA00F447D2 /* SystemConfiguration.framework in Frameworks */,
- 259C802E15D20BAA00F447D2 /* libRestKit.a in Frameworks */,
259C7FFF15D20B5600F447D2 /* CoreGraphics.framework in Frameworks */,
259C7FFB15D20B5600F447D2 /* UIKit.framework in Frameworks */,
259C7FFD15D20B5600F447D2 /* Foundation.framework in Frameworks */,
+ 45F73EB9D2311FFAF6C1338B /* Pods.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -122,7 +86,7 @@
259C800015D20B5600F447D2 /* RKSearchExample */,
259C7FF915D20B5600F447D2 /* Frameworks */,
259C7FF715D20B5600F447D2 /* Products */,
- 259C801715D20B7100F447D2 /* RestKit.xcodeproj */,
+ 8045C6A1DC1A7B372A75E95F /* Pods */,
);
sourceTree = "<group>";
};
@@ -147,6 +111,7 @@
259C7FFA15D20B5600F447D2 /* UIKit.framework */,
259C7FFC15D20B5600F447D2 /* Foundation.framework */,
259C7FFE15D20B5600F447D2 /* CoreGraphics.framework */,
+ 5F88520F4AEA4E5CA9B38E99 /* Pods.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -177,15 +142,13 @@
name = "Supporting Files";
sourceTree = "<group>";
};
- 259C801815D20B7100F447D2 /* Products */ = {
+ 8045C6A1DC1A7B372A75E95F /* Pods */ = {
isa = PBXGroup;
children = (
- 259C802315D20B7100F447D2 /* libRestKit.a */,
- 259C802515D20B7100F447D2 /* RestKitTests.octest */,
- 259C802715D20B7100F447D2 /* RestKit.framework */,
- 259C802915D20B7100F447D2 /* RestKitFrameworkTests.octest */,
+ 97374605117FDAA6FDA05691 /* Pods.debug.xcconfig */,
+ 4839D63C1F0B427271E84C9B /* Pods.release.xcconfig */,
);
- name = Products;
+ name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */
@@ -195,14 +158,16 @@
isa = PBXNativeTarget;
buildConfigurationList = 259C801415D20B5600F447D2 /* Build configuration list for PBXNativeTarget "RKSearchExample" */;
buildPhases = (
+ 647A518E7D82E5FBFCACA0DF /* Check Pods Manifest.lock */,
259C7FF215D20B5600F447D2 /* Sources */,
259C7FF315D20B5600F447D2 /* Frameworks */,
259C7FF415D20B5600F447D2 /* Resources */,
+ 64884B0BE0AA32A1480DCC81 /* Embed Pods Frameworks */,
+ 750345EDEDC2028EA5111217 /* Copy Pods Resources */,
);
buildRules = (
);
dependencies = (
- 259C802D15D20B7B00F447D2 /* PBXTargetDependency */,
);
name = RKSearchExample;
productName = RKSearchExample;
@@ -216,7 +181,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = RKS;
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "Blake Watters";
};
buildConfigurationList = 259C7FF015D20B5600F447D2 /* Build configuration list for PBXProject "RKSearchExample" */;
@@ -229,12 +194,6 @@
mainGroup = 259C7FEB15D20B5600F447D2;
productRefGroup = 259C7FF715D20B5600F447D2 /* Products */;
projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = 259C801815D20B7100F447D2 /* Products */;
- ProjectRef = 259C801715D20B7100F447D2 /* RestKit.xcodeproj */;
- },
- );
projectRoot = "";
targets = (
259C7FF515D20B5600F447D2 /* RKSearchExample */,
@@ -242,37 +201,6 @@
};
/* End PBXProject section */
-/* Begin PBXReferenceProxy section */
- 259C802315D20B7100F447D2 /* libRestKit.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKit.a;
- remoteRef = 259C802215D20B7100F447D2 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 259C802515D20B7100F447D2 /* RestKitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = RestKitTests.octest;
- remoteRef = 259C802415D20B7100F447D2 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 259C802715D20B7100F447D2 /* RestKit.framework */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.framework;
- path = RestKit.framework;
- remoteRef = 259C802615D20B7100F447D2 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 259C802915D20B7100F447D2 /* RestKitFrameworkTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = RestKitFrameworkTests.octest;
- remoteRef = 259C802815D20B7100F447D2 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
/* Begin PBXResourcesBuildPhase section */
259C7FF415D20B5600F447D2 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -287,6 +215,54 @@
};
/* End PBXResourcesBuildPhase section */
+/* Begin PBXShellScriptBuildPhase section */
+ 647A518E7D82E5FBFCACA0DF /* Check Pods Manifest.lock */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Check Pods Manifest.lock";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
+ showEnvVarsInLog = 0;
+ };
+ 64884B0BE0AA32A1480DCC81 /* Embed Pods Frameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Embed Pods Frameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
+ 750345EDEDC2028EA5111217 /* Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Copy Pods Resources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
+/* End PBXShellScriptBuildPhase section */
+
/* Begin PBXSourcesBuildPhase section */
259C7FF215D20B5600F447D2 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -301,14 +277,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 259C802D15D20B7B00F447D2 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = RestKit;
- targetProxy = 259C802C15D20B7B00F447D2 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
259C800315D20B5600F447D2 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
@@ -332,13 +300,13 @@
259C801215D20B5600F447D2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -359,7 +327,6 @@
259C801315D20B5600F447D2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -379,16 +346,13 @@
};
259C801515D20B5600F447D2 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 97374605117FDAA6FDA05691 /* Pods.debug.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RKSearchExample/RKSearchExample-Prefix.pch";
- HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"";
INFOPLIST_FILE = "RKSearchExample/RKSearchExample-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
- OTHER_LDFLAGS = (
- "-ObjC",
- "-all_load",
- );
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ PRODUCT_BUNDLE_IDENTIFIER = "org.restkit.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -396,16 +360,13 @@
};
259C801615D20B5600F447D2 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 4839D63C1F0B427271E84C9B /* Pods.release.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RKSearchExample/RKSearchExample-Prefix.pch";
- HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"";
INFOPLIST_FILE = "RKSearchExample/RKSearchExample-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
- OTHER_LDFLAGS = (
- "-ObjC",
- "-all_load",
- );
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ PRODUCT_BUNDLE_IDENTIFIER = "org.restkit.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
View
2  Examples/RKSearchExample/RKSearchExample/RKSearchExample-Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>org.restkit.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
View
9 Examples/RKTwitter/Podfile
@@ -1,7 +1,6 @@
-platform :ios, '6.0'
+platform :ios, '8.0'
+use_frameworks!
# Install via CocoaPods pointing at current local codebase
-target 'RKTwitterCocoaPods' do
- pod 'RestKit/Network', :path => '../../'
- pod 'RestKit/ObjectMapping', :path => '../../'
-end
+pod 'RestKit/Network', :path => '../../'
+pod 'RestKit/ObjectMapping', :path => '../../'
View
309 Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
@@ -7,18 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- 001D8303A88B451D830741B8 /* libPods-RKTwitterCocoaPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7666CC5642F94148AF23256A /* libPods-RKTwitterCocoaPods.a */; };
- 1D3623260D0F684500981E51 /* RKTwitterAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* RKTwitterAppDelegate.m */; };
- 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
- 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
- 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
- 25063C9116021B16007CAC2B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25063C9016021B16007CAC2B /* Default-568h@2x.png */; };
- 250CA69A147D8FCC0047D347 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA699147D8FCC0047D347 /* Security.framework */; };
- 250CA69B147D8FD30047D347 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25160FB31456E8A30060A5C5 /* libRestKit.a */; };
- 250CA69C147D8FFD0047D347 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E864123424F000ACB5D7 /* CoreData.framework */; };
- 2538E811123419CA00ACB5D7 /* RKTUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 2538E810123419CA00ACB5D7 /* RKTUser.m */; };
- 2538E814123419EC00ACB5D7 /* RKTweet.m in Sources */ = {isa = PBXBuildFile; fileRef = 2538E813123419EC00ACB5D7 /* RKTweet.m */; };
- 2538E8671234250100ACB5D7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E8661234250100ACB5D7 /* SystemConfiguration.framework */; };
25AABCF817B69CC50061DC5B /* listbg.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE3FA125B9A6E0083FDCB /* listbg.png */; };
25AABCF917B69CC50061DC5B /* listbg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE3FB125B9A6E0083FDCB /* listbg@2x.png */; };
25AABCFA17B69CC50061DC5B /* BG.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40A125B9B450083FDCB /* BG.png */; };
@@ -35,74 +23,15 @@
25AABD0B17B69CC50061DC5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
25AABD0C17B69CC50061DC5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
25AABD0D17B69CC50061DC5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
- 25BE936614F96729008BC1C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25BE936514F96729008BC1C0 /* QuartzCore.framework */; };
- 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
- 28D7ACF80DDB3853001CB0EB /* RKTwitterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* RKTwitterViewController.m */; };
- 3F02F592131D683A004E1F54 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F02F591131D683A004E1F54 /* libxml2.dylib */; };
- 3F3CE3FC125B9A6E0083FDCB /* listbg.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE3FA125B9A6E0083FDCB /* listbg.png */; };
- 3F3CE3FD125B9A6E0083FDCB /* listbg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE3FB125B9A6E0083FDCB /* listbg@2x.png */; };
- 3F3CE40E125B9B450083FDCB /* BG.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40A125B9B450083FDCB /* BG.png */; };
- 3F3CE40F125B9B450083FDCB /* BG@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40B125B9B450083FDCB /* BG@2x.png */; };
- 3F3CE410125B9B450083FDCB /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40C125B9B450083FDCB /* Default.png */; };
- 3F3CE411125B9B450083FDCB /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40D125B9B450083FDCB /* Default@2x.png */; };
- 84F524C212824D5000C370EA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F524C112824D5000C370EA /* CFNetwork.framework */; };
- 84F524C612824D5B00C370EA /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F524C512824D5B00C370EA /* MobileCoreServices.framework */; };
+ 73D990C2D2D5A068521FACEF /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0C5817426474EE329BB79E2 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 250AC4BA1358C7A8006F084F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 250AC48A1358C79C006F084F /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 25160D1514564E810060A5C5;
- remoteInfo = RestKit;
- };
- 25160FB21456E8A30060A5C5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 250AC48A1358C79C006F084F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D1614564E810060A5C5;
- remoteInfo = RestKit;
- };
- 25160FB41456E8A30060A5C5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 250AC48A1358C79C006F084F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D2614564E820060A5C5;
- remoteInfo = RestKitTests;
- };
- 25160FB61456E8A30060A5C5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 250AC48A1358C79C006F084F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E62145651060060A5C5;
- remoteInfo = RestKitFramework;
- };
- 25160FB81456E8A30060A5C5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 250AC48A1358C79C006F084F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E78145651060060A5C5;
- remoteInfo = RestKitFrameworkTests;
- };
- 25AABCF617B69CC50061DC5B /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 250AC48A1358C79C006F084F /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 25160D1514564E810060A5C5;
- remoteInfo = RestKit;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXFileReference section */
- 1BBF770CA495AD12361E6DA5 /* Pods-RKTwitterCocoaPods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RKTwitterCocoaPods.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RKTwitterCocoaPods/Pods-RKTwitterCocoaPods.debug.xcconfig"; sourceTree = "<group>"; };
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* RKTwitterAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTwitterAppDelegate.h; sourceTree = "<group>"; };
1D3623250D0F684500981E51 /* RKTwitterAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTwitterAppDelegate.m; sourceTree = "<group>"; };
- 1D6058910D05DD3D006BFB54 /* RKTwitter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RKTwitter.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
25063C9016021B16007CAC2B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
- 250AC48A1358C79C006F084F /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../../RestKit.xcodeproj; sourceTree = "<group>"; };
250CA699147D8FCC0047D347 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
2538E80F123419CA00ACB5D7 /* RKTUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTUser.h; sourceTree = "<group>"; };
2538E810123419CA00ACB5D7 /* RKTUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTUser.m; sourceTree = "<group>"; };
@@ -110,12 +39,13 @@
2538E813123419EC00ACB5D7 /* RKTweet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTweet.m; sourceTree = "<group>"; };
2538E864123424F000ACB5D7 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
2538E8661234250100ACB5D7 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
- 25AABD1417B69CC50061DC5B /* RKTwitter copy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RKTwitter copy.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 25AABD1417B69CC50061DC5B /* RKTwitter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RKTwitter.app; sourceTree = BUILT_PRODUCTS_DIR; };
25BE936514F96729008BC1C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
28D7ACF60DDB3853001CB0EB /* RKTwitterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTwitterViewController.h; sourceTree = "<group>"; };
28D7ACF70DDB3853001CB0EB /* RKTwitterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTwitterViewController.m; sourceTree = "<group>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ 2C4E0FC1267B5DE1E5594342 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* RKTwitter_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTwitter_Prefix.pch; sourceTree = "<group>"; };
3F02F591131D683A004E1F54 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
3F3CE3FA125B9A6E0083FDCB /* listbg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = listbg.png; sourceTree = "<group>"; };
@@ -124,32 +54,14 @@
3F3CE40B125B9B450083FDCB /* BG@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BG@2x.png"; sourceTree = "<group>"; };
3F3CE40C125B9B450083FDCB /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
3F3CE40D125B9B450083FDCB /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- 7666CC5642F94148AF23256A /* libPods-RKTwitterCocoaPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RKTwitterCocoaPods.a"; sourceTree = BUILT_PRODUCTS_DIR; };
84F524C112824D5000C370EA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
84F524C512824D5B00C370EA /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
8D1107310486CEB800E47090 /* RKTwitter-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "RKTwitter-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
- EC32B4B0491C719850D46F92 /* Pods-RKTwitterCocoaPods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RKTwitterCocoaPods.release.xcconfig"; path = "Pods/Target Support Files/Pods-RKTwitterCocoaPods/Pods-RKTwitterCocoaPods.release.xcconfig"; sourceTree = "<group>"; };
+ 9459B171A0B89699CB1F7ECC /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+ F0C5817426474EE329BB79E2 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 25BE936614F96729008BC1C0 /* QuartzCore.framework in Frameworks */,
- 250CA69C147D8FFD0047D347 /* CoreData.framework in Frameworks */,
- 250CA69B147D8FD30047D347 /* libRestKit.a in Frameworks */,
- 250CA69A147D8FCC0047D347 /* Security.framework in Frameworks */,
- 3F02F592131D683A004E1F54 /* libxml2.dylib in Frameworks */,
- 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
- 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
- 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
- 2538E8671234250100ACB5D7 /* SystemConfiguration.framework in Frameworks */,
- 84F524C212824D5000C370EA /* CFNetwork.framework in Frameworks */,
- 84F524C612824D5B00C370EA /* MobileCoreServices.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
25AABD0517B69CC50061DC5B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -158,7 +70,7 @@
25AABD0B17B69CC50061DC5B /* Foundation.framework in Frameworks */,
25AABD0C17B69CC50061DC5B /* UIKit.framework in Frameworks */,
25AABD0D17B69CC50061DC5B /* CoreGraphics.framework in Frameworks */,
- 001D8303A88B451D830741B8 /* libPods-RKTwitterCocoaPods.a in Frameworks */,
+ 73D990C2D2D5A068521FACEF /* Pods.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -183,19 +95,7 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
- 1D6058910D05DD3D006BFB54 /* RKTwitter.app */,
- 25AABD1417B69CC50061DC5B /* RKTwitter copy.app */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 250AC48B1358C79C006F084F /* Products */ = {
- isa = PBXGroup;
- children = (
- 25160FB31456E8A30060A5C5 /* libRestKit.a */,
- 25160FB51456E8A30060A5C5 /* RestKitTests.octest */,
- 25160FB71456E8A30060A5C5 /* RestKit.framework */,
- 25160FB91456E8A30060A5C5 /* RestKitFrameworkTests.octest */,
+ 25AABD1417B69CC50061DC5B /* RKTwitter.app */,
);
name = Products;
sourceTree = "<group>";
@@ -204,7 +104,6 @@
isa = PBXGroup;
children = (
25063C9016021B16007CAC2B /* Default-568h@2x.png */,
- 250AC48A1358C79C006F084F /* RestKit.xcodeproj */,
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
@@ -251,7 +150,7 @@
2538E8661234250100ACB5D7 /* SystemConfiguration.framework */,
84F524C112824D5000C370EA /* CFNetwork.framework */,
84F524C512824D5B00C370EA /* MobileCoreServices.framework */,
- 7666CC5642F94148AF23256A /* libPods-RKTwitterCocoaPods.a */,
+ F0C5817426474EE329BB79E2 /* Pods.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -259,8 +158,8 @@
A54F9C18924391E57B4EFF4D /* Pods */ = {
isa = PBXGroup;
children = (
- 1BBF770CA495AD12361E6DA5 /* Pods-RKTwitterCocoaPods.debug.xcconfig */,
- EC32B4B0491C719850D46F92 /* Pods-RKTwitterCocoaPods.release.xcconfig */,
+ 9459B171A0B89699CB1F7ECC /* Pods.debug.xcconfig */,
+ 2C4E0FC1267B5DE1E5594342 /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
@@ -268,42 +167,24 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 1D6058900D05DD3D006BFB54 /* RKTwitter */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "RKTwitter" */;
- buildPhases = (
- 1D60588D0D05DD3D006BFB54 /* Resources */,
- 1D60588E0D05DD3D006BFB54 /* Sources */,
- 1D60588F0D05DD3D006BFB54 /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- 250AC4BB1358C7A8006F084F /* PBXTargetDependency */,
- );
- name = RKTwitter;
- productName = RKTwitter;
- productReference = 1D6058910D05DD3D006BFB54 /* RKTwitter.app */;
- productType = "com.apple.product-type.application";
- };
- 25AABCF417B69CC50061DC5B /* RKTwitterCocoaPods */ = {
+ 25AABCF417B69CC50061DC5B /* RKTwitter */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 25AABD1117B69CC50061DC5B /* Build configuration list for PBXNativeTarget "RKTwitterCocoaPods" */;
+ buildConfigurationList = 25AABD1117B69CC50061DC5B /* Build configuration list for PBXNativeTarget "RKTwitter" */;
buildPhases = (
B2D422E3401D465BACF8687A /* Check Pods Manifest.lock */,
25AABCF717B69CC50061DC5B /* Resources */,
25AABCFF17B69CC50061DC5B /* Sources */,
25AABD0517B69CC50061DC5B /* Frameworks */,
BA14B331096F49758212B549 /* Copy Pods Resources */,
+ B73887517504A74F7323976B /* Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
- 25AABCF517B69CC50061DC5B /* PBXTargetDependency */,
);
- name = RKTwitterCocoaPods;
+ name = RKTwitter;
productName = RKTwitter;
- productReference = 25AABD1417B69CC50061DC5B /* RKTwitter copy.app */;
+ productReference = 25AABD1417B69CC50061DC5B /* RKTwitter.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -312,7 +193,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0700;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RKTwitter" */;
compatibilityVersion = "Xcode 3.2";
@@ -326,66 +207,14 @@
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = 250AC48B1358C79C006F084F /* Products */;
- ProjectRef = 250AC48A1358C79C006F084F /* RestKit.xcodeproj */;
- },
- );
projectRoot = "";
targets = (
- 1D6058900D05DD3D006BFB54 /* RKTwitter */,
- 25AABCF417B69CC50061DC5B /* RKTwitterCocoaPods */,
+ 25AABCF417B69CC50061DC5B /* RKTwitter */,
);
};
/* End PBXProject section */
-/* Begin PBXReferenceProxy section */
- 25160FB31456E8A30060A5C5 /* libRestKit.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKit.a;
- remoteRef = 25160FB21456E8A30060A5C5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 25160FB51456E8A30060A5C5 /* RestKitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = RestKitTests.xctest;
- remoteRef = 25160FB41456E8A30060A5C5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 25160FB71456E8A30060A5C5 /* RestKit.framework */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.framework;
- path = RestKit.framework;
- remoteRef = 25160FB61456E8A30060A5C5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 25160FB91456E8A30060A5C5 /* RestKitFrameworkTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = RestKitFrameworkTests.xctest;
- remoteRef = 25160FB81456E8A30060A5C5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
/* Begin PBXResourcesBuildPhase section */
- 1D60588D0D05DD3D006BFB54 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 3F3CE3FC125B9A6E0083FDCB /* listbg.png in Resources */,
- 3F3CE3FD125B9A6E0083FDCB /* listbg@2x.png in Resources */,
- 3F3CE40E125B9B450083FDCB /* BG.png in Resources */,
- 3F3CE40F125B9B450083FDCB /* BG@2x.png in Resources */,
- 3F3CE410125B9B450083FDCB /* Default.png in Resources */,
- 3F3CE411125B9B450083FDCB /* Default@2x.png in Resources */,
- 25063C9116021B16007CAC2B /* Default-568h@2x.png in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
25AABCF717B69CC50061DC5B /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -418,36 +247,39 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
- BA14B331096F49758212B549 /* Copy Pods Resources */ = {
+ B73887517504A74F7323976B /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "Copy Pods Resources";
+ name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RKTwitterCocoaPods/Pods-RKTwitterCocoaPods-resources.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 1D60588E0D05DD3D006BFB54 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
+ BA14B331096F49758212B549 /* Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
- 1D60589B0D05DD56006BFB54 /* main.m in Sources */,
- 1D3623260D0F684500981E51 /* RKTwitterAppDelegate.m in Sources */,
- 28D7ACF80DDB3853001CB0EB /* RKTwitterViewController.m in Sources */,
- 2538E811123419CA00ACB5D7 /* RKTUser.m in Sources */,
- 2538E814123419EC00ACB5D7 /* RKTweet.m in Sources */,
+ );
+ inputPaths = (
+ );
+ name = "Copy Pods Resources";
+ outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+ showEnvVarsInLog = 0;
};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
25AABCFF17B69CC50061DC5B /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -462,59 +294,10 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 250AC4BB1358C7A8006F084F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = RestKit;
- targetProxy = 250AC4BA1358C7A8006F084F /* PBXContainerItemProxy */;
- };
- 25AABCF517B69CC50061DC5B /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = RestKit;
- targetProxy = 25AABCF617B69CC50061DC5B /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin XCBuildConfiguration section */
- 1D6058940D05DD3E006BFB54 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- BUILD_STYLE = Debug;
- CLANG_ENABLE_OBJC_ARC = YES;
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = RKTwitter_Prefix.pch;
- HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"";
- INFOPLIST_FILE = "Resources/RKTwitter-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = "-ObjC";
- PRODUCT_NAME = RKTwitter;
- };
- name = Debug;
- };
- 1D6058950D05DD3E006BFB54 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- BUILD_STYLE = Release;
- CLANG_ENABLE_OBJC_ARC = YES;
- COPY_PHASE_STRIP = YES;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = RKTwitter_Prefix.pch;
- HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/../../Headers\"";
- INFOPLIST_FILE = "Resources/RKTwitter-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_LDFLAGS = "-ObjC";
- PRODUCT_NAME = RKTwitter;
- VALIDATE_PRODUCT = YES;
- };
- name = Release;
- };
25AABD1217B69CC50061DC5B /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 1BBF770CA495AD12361E6DA5 /* Pods-RKTwitterCocoaPods.debug.xcconfig */;
+ baseConfigurationReference = 9459B171A0B89699CB1F7ECC /* Pods.debug.xcconfig */;
buildSettings = {
BUILD_STYLE = Debug;
CLANG_ENABLE_OBJC_ARC = YES;
@@ -524,15 +307,16 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = RKTwitter_Prefix.pch;
INFOPLIST_FILE = "Resources/RKTwitter-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES;
- PRODUCT_NAME = "RKTwitter copy";
+ PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.RKTwitter;
+ PRODUCT_NAME = RKTwitter;
};
name = Debug;
};
25AABD1317B69CC50061DC5B /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = EC32B4B0491C719850D46F92 /* Pods-RKTwitterCocoaPods.release.xcconfig */;
+ baseConfigurationReference = 2C4E0FC1267B5DE1E5594342 /* Pods.release.xcconfig */;
buildSettings = {
BUILD_STYLE = Release;
CLANG_ENABLE_OBJC_ARC = YES;
@@ -540,8 +324,9 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = RKTwitter_Prefix.pch;
INFOPLIST_FILE = "Resources/RKTwitter-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- PRODUCT_NAME = "RKTwitter copy";
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.RKTwitter;
+ PRODUCT_NAME = RKTwitter;
VALIDATE_PRODUCT = YES;
};
name = Release;
@@ -551,6 +336,7 @@
buildSettings = {
BUILD_STYLE = Debug;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ ENABLE_TESTABILITY = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -573,16 +359,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "RKTwitter" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 1D6058940D05DD3E006BFB54 /* Debug */,
- 1D6058950D05DD3E006BFB54 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 25AABD1117B69CC50061DC5B /* Build configuration list for PBXNativeTarget "RKTwitterCocoaPods" */ = {
+ 25AABD1117B69CC50061DC5B /* Build configuration list for PBXNativeTarget "RKTwitter" */ = {
isa = XCConfigurationList;
buildConfigurations = (
25AABD1217B69CC50061DC5B /* Debug */,
View
35 ...ata/xcschemes/RKTwitterCocoaPods.xcscheme → ...xcshareddata/xcschemes/RKTwitter.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0460"
+ LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -15,45 +15,49 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "25AABCF417B69CC50061DC5B"
- BuildableName = "RKTwitter copy.app"
- BlueprintName = "RKTwitterCocoaPods"
+ BuildableName = "RKTwitter.app"
+ BlueprintName = "RKTwitter"
ReferencedContainer = "container:RKTwitter.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "25AABCF417B69CC50061DC5B"
- BuildableName = "RKTwitter copy.app"
- BlueprintName = "RKTwitterCocoaPods"
+ BuildableName = "RKTwitter.app"
+ BlueprintName = "RKTwitter"
ReferencedContainer = "container:RKTwitter.xcodeproj">
</BuildableReference>
</MacroExpansion>
+ <AdditionalOptions>
+ </AdditionalOptions>
</TestAction>
<LaunchAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
allowLocationSimulation = "YES">
- <BuildableProductRunnable>
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "25AABCF417B69CC50061DC5B"
- BuildableName = "RKTwitter copy.app"
- BlueprintName = "RKTwitterCocoaPods"
+ BuildableName = "RKTwitter.app"
+ BlueprintName = "RKTwitter"
ReferencedContainer = "container:RKTwitter.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
@@ -61,17 +65,18 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
+ buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
debugDocumentVersioning = "YES">
- <BuildableProductRunnable>
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "25AABCF417B69CC50061DC5B"
- BuildableName = "RKTwitter copy.app"
- BlueprintName = "RKTwitterCocoaPods"
+ BuildableName = "RKTwitter.app"
+ BlueprintName = "RKTwitter"
ReferencedContainer = "container:RKTwitter.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
View
1  Examples/RKTwitter/RKTwitter.xcworkspace/contents.xcworkspacedata
@@ -1 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:RKTwitter.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace>
View
2  Examples/RKTwitter/Resources/RKTwitter-Info.plist
@@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
View
9 Examples/RKTwitterCoreData/Podfile
@@ -0,0 +1,9 @@
+platform :ios, '8.0'
+use_frameworks!
+
+link_with 'RKTwitterCoreData', 'Generate Seed Database'
+
+# Install via CocoaPods pointing at current local codebase
+pod 'RestKit/Network', :path => '../../'
+pod 'RestKit/ObjectMapping', :path => '../../'
+pod 'RestKit/CoreData', :path => '../../'
View
173 Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj
@@ -12,9 +12,7 @@
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
25014071153706FD004E0466 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6CF147D90C50047D347 /* Security.framework */; };
- 25014085153707CB004E0466 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6C6147D90A50047D347 /* libRestKit.a */; };
25014086153707E2004E0466 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD39C14D14EEED8700E84874 /* QuartzCore.framework */; };
- 250CA6CE147D90BA0047D347 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6C6147D90A50047D347 /* libRestKit.a */; };
250CA6D0147D90C50047D347 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6CF147D90C50047D347 /* Security.framework */; };
252E157D16397DCA000B729E /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2536AF3B16397A0200AD803D /* MainStoryboard.storyboard */; };
2536AF3C16397A0200AD803D /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2536AF3B16397A0200AD803D /* MainStoryboard.storyboard */; };
@@ -55,54 +53,13 @@
3FB46641131D78A400E37C51 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB46640131D78A400E37C51 /* libxml2.dylib */; };
8452D3F9128244D90069F4A9 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8452D3F8128244D90069F4A9 /* CFNetwork.framework */; };
8452D3FD128244E60069F4A9 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8452D3FC128244E60069F4A9 /* MobileCoreServices.framework */; };
+ 91E489421B66047A004B5AB5 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0702A131DA8B31559EADB35 /* Pods.framework */; };
+ 91E489431B6604A9004B5AB5 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB46640131D78A400E37C51 /* libxml2.dylib */; };
+ 91E489461B660547004B5AB5 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 259D0FC318076E40007C66D6 /* Default-568h@2x.png */; };
+ A4AAAC70510CB014ED4378BD /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0702A131DA8B31559EADB35 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
CD39C14E14EEED8700E84874 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD39C14D14EEED8700E84874 /* QuartzCore.framework */; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 250CA6C5147D90A50047D347 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D1614564E810060A5C5;
- remoteInfo = RestKit;
- };
- 250CA6C7147D90A50047D347 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160D2614564E820060A5C5;
- remoteInfo = RestKitTests;
- };
- 250CA6C9147D90A50047D347 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E62145651060060A5C5;
- remoteInfo = RestKitFramework;
- };
- 250CA6CB147D90A50047D347 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25160E78145651060060A5C5;
- remoteInfo = RestKitFrameworkTests;
- };
- 25F2A1771322D59400A33DE4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 25160D1514564E810060A5C5;
- remoteInfo = RestKit;
- };
- 3F3CE2E3125B93EB0083FDCB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 25160D1514564E810060A5C5;
- remoteInfo = RestKit;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXFileReference section */
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* RKTwitterAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTwitterAppDelegate.h; sourceTree = "<group>"; };
@@ -111,12 +68,11 @@
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
250CA6CF147D90C50047D347 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
2536AF3B16397A0200AD803D /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
- 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../../RestKit.xcodeproj; sourceTree = SOURCE_ROOT; };
2538E812123419EC00ACB5D7 /* RKTweet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTweet.h; sourceTree = "<group>"; };
2538E813123419EC00ACB5D7 /* RKTweet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTweet.m; sourceTree = "<group>"; };
2538E864123424F000ACB5D7 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
2538E8661234250100ACB5D7 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
- 259D0FC318076E40007C66D6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+ 259D0FC318076E40007C66D6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../Default-568h@2x.png"; sourceTree = "<group>"; };