Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update project settings

correct minor printf formats
  • Loading branch information...
commit f2e23bf660d1ded236b1b2e406d61e1a8a46954b 1 parent 4045f01
@casademora casademora authored
View
2  MagicalRecord/Categories/DataImport/NSObject+MagicalDataImport.m
@@ -31,7 +31,7 @@ - (NSString *) MR_lookupKeyForAttribute:(NSAttributeDescription *)attributeInfo;
for (NSUInteger i = 1; i < kMagicalRecordImportMaximumAttributeFailoverDepth && value == nil; i++)
{
- attributeName = [NSString stringWithFormat:@"%@.%d", kMagicalRecordImportAttributeKeyMapKey, i];
+ attributeName = [NSString stringWithFormat:@"%@.%ld", kMagicalRecordImportAttributeKeyMapKey, i];
lookupKey = [[attributeInfo userInfo] valueForKey:attributeName];
if (lookupKey == nil)
{
View
2  MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRecord.m
@@ -118,7 +118,7 @@ + (NSArray *) MR_propertiesNamed:(NSArray *)properties
}
else
{
- MRLog(@"Property '%@' not found in %d properties for %@", propertyName, [propDict count], NSStringFromClass(self));
+ MRLog(@"Property '%@' not found in %ld properties for %@", propertyName, [propDict count], NSStringFromClass(self));
}
}
}
View
8 Project Files/Magical Record.xcodeproj/project.pbxproj
@@ -302,6 +302,7 @@
C7913BA813FB1D2A007E09CC /* SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.m; sourceTree = "<group>"; };
C7913BAC13FB1DF9007E09CC /* ImportSingleEntityRelatedToMappedEntityWithNestedMappedAttributesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImportSingleEntityRelatedToMappedEntityWithNestedMappedAttributesTests.m; path = "Unit Tests/ImportSingleEntityRelatedToMappedEntityWithNestedMappedAttributesTests.m"; sourceTree = "<group>"; };
C7913BAE13FB1E11007E09CC /* SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.json; path = "Unit Tests/Fixtures/SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.json"; sourceTree = "<group>"; };
+ C7962CE11567EF3C00C9A960 /* iOS App Unit Tests.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "iOS App Unit Tests.entitlements"; sourceTree = "<group>"; };
C7B7379913FAE5D500EE4940 /* SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.json; path = "Unit Tests/Fixtures/SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.json"; sourceTree = "<group>"; };
C7B7379D13FAE6D000EE4940 /* ImportSingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImportSingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyTests.m; path = "Unit Tests/ImportSingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyTests.m"; sourceTree = "<group>"; };
C7BD887413DBF8A000274567 /* TestModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TestModel.xcdatamodel; sourceTree = "<group>"; };
@@ -486,6 +487,7 @@
C721C80213D0C3CD0097AB6F /* iOS App Unit Tests */ = {
isa = PBXGroup;
children = (
+ C7962CE11567EF3C00C9A960 /* iOS App Unit Tests.entitlements */,
C763783113E10BEC0009A6CA /* GHUnitIOSTestMain.m */,
C721C80313D0C3CD0097AB6F /* Supporting Files */,
);
@@ -861,7 +863,7 @@
C721C7A213D0A3750097AB6F /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = "Magical Panda Software LLC";
};
buildConfigurationList = C721C7A513D0A3750097AB6F /* Build configuration list for PBXProject "Magical Record" */;
@@ -1152,6 +1154,7 @@
buildSettings = {
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+ COMBINE_HIDPI_IMAGES = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1176,6 +1179,7 @@
buildSettings = {
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+ COMBINE_HIDPI_IMAGES = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1298,6 +1302,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CODE_SIGN_ENTITLEMENTS = "iOS App Unit Tests/iOS App Unit Tests.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
@@ -1357,6 +1362,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CODE_SIGN_ENTITLEMENTS = "iOS App Unit Tests/iOS App Unit Tests.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
View
2  Project Files/Magical Record.xcodeproj/xcshareddata/xcschemes/Mac App Unit Tests.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0430"
+ LastUpgradeVersion = "0440"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
View
2  Project Files/Magical Record.xcodeproj/xcshareddata/xcschemes/iOS App Unit Tests.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0430"
+ LastUpgradeVersion = "0440"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
View
2  Project Files/Unit Tests/NSManagedObjectHelperTests.m
@@ -97,7 +97,7 @@ - (void) createSampleData:(NSInteger)numberOfTestEntitiesToCreate
for (NSInteger i = 0; i < numberOfTestEntitiesToCreate; i++)
{
SingleRelatedEntity *testEntity = [SingleRelatedEntity createEntity];
- testEntity.mappedStringAttribute = [NSString stringWithFormat:@"%d", i / 5];
+ testEntity.mappedStringAttribute = [NSString stringWithFormat:@"%ld", i / 5];
}
[[NSManagedObjectContext MR_defaultContext] MR_save];
View
8 Project Files/iOS App Unit Tests/iOS App Unit Tests.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>DataProtectionClass</key>
+ <string>NSFileProtectionComplete</string>
+</dict>
+</plist>
Please sign in to comment.
Something went wrong with that request. Please try again.