Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix compile error for assoc. reference key

re-compiled entities with latest version of mogenerator
  • Loading branch information...
commit bc4ae8102365862f67f85a40394a5f5f7d19668d 1 parent b446251
@casademora casademora authored
View
8 Magical Record.xcodeproj/project.pbxproj
@@ -115,7 +115,7 @@
C7BD889313DBFA6200274567 /* DifferentClassNameMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = C7BD888713DBFA6200274567 /* DifferentClassNameMapping.m */; };
C7BD889413DBFA6200274567 /* SingleEntityWithNoRelationships.m in Sources */ = {isa = PBXBuildFile; fileRef = C7BD888913DBFA6200274567 /* SingleEntityWithNoRelationships.m */; };
C7BD889513DBFA6200274567 /* SingleRelatedEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = C7BD888B13DBFA6200274567 /* SingleRelatedEntity.m */; };
- C7C9A37313F43D93002C5B0C /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = C7C9A37213F43D93002C5B0C /* JSONKit.m */; };
+ C7C9A37313F43D93002C5B0C /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = C7C9A37213F43D93002C5B0C /* JSONKit.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
C7C9A37613F44A3C002C5B0C /* ImportSingleEntityRelatedToMappedEntityUsingDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7C9A37513F44A3C002C5B0C /* ImportSingleEntityRelatedToMappedEntityUsingDefaultsTests.m */; };
C7C9A37D13F44B08002C5B0C /* SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.json in Resources */ = {isa = PBXBuildFile; fileRef = C7C9A37C13F44B08002C5B0C /* SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.json */; };
C7C9A37F13F44B29002C5B0C /* SingleEntityRelatedToMappedEntityUsingDefaults.json in Resources */ = {isa = PBXBuildFile; fileRef = C7C9A37E13F44B29002C5B0C /* SingleEntityRelatedToMappedEntityUsingDefaults.json */; };
@@ -930,7 +930,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cd \"Unit Tests/Fixtures/iOS\" && mogenerator -m TestModel.xcdatamodeld/TestModel.xcdatamodel -O TestEntities";
+ shellScript = "cd \"Unit Tests/Fixtures/iOS\" && mogenerator -m TestModel.xcdatamodeld/TestModel.xcdatamodel -O TestEntities --template-var arc=true";
};
/* End PBXShellScriptBuildPhase section */
@@ -1181,7 +1181,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- CLANG_ENABLE_OBJC_ARC = NO;
+ CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
@@ -1239,7 +1239,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- CLANG_ENABLE_OBJC_ARC = NO;
+ CLANG_ENABLE_OBJC_ARC = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
View
4 Source/Categories/NSManagedObjectContext+MagicalRecord.m
@@ -10,8 +10,8 @@
static NSManagedObjectContext *defaultManageObjectContext_ = nil;
static NSString const * kMagicalRecordManagedObjectContextKey = @"MagicalRecord_NSManagedObjectContextForThreadKey";
-static NSString const * kMagicalRecordNotifiesMainContextAssociatedValueKey = @"kMagicalRecordNotifiesMainContextOnSave";
-NSString * const kMagicalRecordDidMergeChangesFromiCloudNotification = @"kMagicalRecordDidMergeChangesFromiCloudNotification";
+static void const * kMagicalRecordNotifiesMainContextAssociatedValueKey = @"kMagicalRecordNotifiesMainContextOnSave";
+ NSString * const kMagicalRecordDidMergeChangesFromiCloudNotification = @"kMagicalRecordDidMergeChangesFromiCloudNotification";
@interface NSManagedObjectContext (MagicalRecordPrivate)
View
4 Unit Tests/Fixtures/iOS/TestEntities/_AbstractRelatedEntity.h
@@ -5,7 +5,7 @@
extern const struct AbstractRelatedEntityAttributes {
- NSString *sampleBaseAttribute;
+ __unsafe_unretained NSString *sampleBaseAttribute;
} AbstractRelatedEntityAttributes;
extern const struct AbstractRelatedEntityRelationships {
@@ -29,7 +29,7 @@ extern const struct AbstractRelatedEntityFetchedProperties {
-@property (nonatomic, retain) NSString *sampleBaseAttribute;
+@property (nonatomic, strong) NSString *sampleBaseAttribute;
//- (BOOL)validateSampleBaseAttribute:(id*)value_ error:(NSError**)error_;
View
4 Unit Tests/Fixtures/iOS/TestEntities/_ConcreteRelatedEntity.h
@@ -5,7 +5,7 @@
#import "AbstractRelatedEntity.h"
extern const struct ConcreteRelatedEntityAttributes {
- NSString *sampleConcreteAttribute;
+ __unsafe_unretained NSString *sampleConcreteAttribute;
} ConcreteRelatedEntityAttributes;
extern const struct ConcreteRelatedEntityRelationships {
@@ -29,7 +29,7 @@ extern const struct ConcreteRelatedEntityFetchedProperties {
-@property (nonatomic, retain) NSString *sampleConcreteAttribute;
+@property (nonatomic, strong) NSString *sampleConcreteAttribute;
//- (BOOL)validateSampleConcreteAttribute:(id*)value_ error:(NSError**)error_;
View
16 Unit Tests/Fixtures/iOS/TestEntities/_MappedEntity.h
@@ -5,10 +5,10 @@
extern const struct MappedEntityAttributes {
- NSString *mappedEntityID;
- NSString *nestedAttribute;
- NSString *sampleAttribute;
- NSString *testMappedEntityID;
+ __unsafe_unretained NSString *mappedEntityID;
+ __unsafe_unretained NSString *nestedAttribute;
+ __unsafe_unretained NSString *sampleAttribute;
+ __unsafe_unretained NSString *testMappedEntityID;
} MappedEntityAttributes;
extern const struct MappedEntityRelationships {
@@ -35,7 +35,7 @@ extern const struct MappedEntityFetchedProperties {
-@property (nonatomic, retain) NSNumber *mappedEntityID;
+@property (nonatomic, strong) NSNumber *mappedEntityID;
@property short mappedEntityIDValue;
@@ -47,7 +47,7 @@ extern const struct MappedEntityFetchedProperties {
-@property (nonatomic, retain) NSString *nestedAttribute;
+@property (nonatomic, strong) NSString *nestedAttribute;
//- (BOOL)validateNestedAttribute:(id*)value_ error:(NSError**)error_;
@@ -55,7 +55,7 @@ extern const struct MappedEntityFetchedProperties {
-@property (nonatomic, retain) NSString *sampleAttribute;
+@property (nonatomic, strong) NSString *sampleAttribute;
//- (BOOL)validateSampleAttribute:(id*)value_ error:(NSError**)error_;
@@ -63,7 +63,7 @@ extern const struct MappedEntityFetchedProperties {
-@property (nonatomic, retain) NSNumber *testMappedEntityID;
+@property (nonatomic, strong) NSNumber *testMappedEntityID;
@property long long testMappedEntityIDValue;
View
8 ...Fixtures/iOS/TestEntities/_SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.h
@@ -5,11 +5,11 @@
extern const struct SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyAttributes {
- NSString *testPrimaryKey;
+ __unsafe_unretained NSString *testPrimaryKey;
} SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyAttributes;
extern const struct SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyRelationships {
- NSString *mappedEntities;
+ __unsafe_unretained NSString *mappedEntities;
} SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyRelationships;
extern const struct SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyFetchedProperties {
@@ -31,7 +31,7 @@ extern const struct SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey
-@property (nonatomic, retain) NSNumber *testPrimaryKey;
+@property (nonatomic, strong) NSNumber *testPrimaryKey;
@property short testPrimaryKeyValue;
@@ -44,7 +44,7 @@ extern const struct SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey
-@property (nonatomic, retain) NSSet* mappedEntities;
+@property (nonatomic, strong) NSSet* mappedEntities;
- (NSMutableSet*)mappedEntitiesSet;
View
8 Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityUsingDefaults.h
@@ -5,11 +5,11 @@
extern const struct SingleEntityRelatedToMappedEntityUsingDefaultsAttributes {
- NSString *singleEntityRelatedToMappedEntityUsingDefaultsID;
+ __unsafe_unretained NSString *singleEntityRelatedToMappedEntityUsingDefaultsID;
} SingleEntityRelatedToMappedEntityUsingDefaultsAttributes;
extern const struct SingleEntityRelatedToMappedEntityUsingDefaultsRelationships {
- NSString *mappedEntity;
+ __unsafe_unretained NSString *mappedEntity;
} SingleEntityRelatedToMappedEntityUsingDefaultsRelationships;
extern const struct SingleEntityRelatedToMappedEntityUsingDefaultsFetchedProperties {
@@ -31,7 +31,7 @@ extern const struct SingleEntityRelatedToMappedEntityUsingDefaultsFetchedPropert
-@property (nonatomic, retain) NSNumber *singleEntityRelatedToMappedEntityUsingDefaultsID;
+@property (nonatomic, strong) NSNumber *singleEntityRelatedToMappedEntityUsingDefaultsID;
@property short singleEntityRelatedToMappedEntityUsingDefaultsIDValue;
@@ -44,7 +44,7 @@ extern const struct SingleEntityRelatedToMappedEntityUsingDefaultsFetchedPropert
-@property (nonatomic, retain) MappedEntity* mappedEntity;
+@property (nonatomic, strong) MappedEntity* mappedEntity;
//- (BOOL)validateMappedEntity:(id*)value_ error:(NSError**)error_;
View
4 ...Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.h
@@ -8,7 +8,7 @@ extern const struct SingleEntityRelatedToMappedEntityUsingMappedPrimaryKeyAttrib
} SingleEntityRelatedToMappedEntityUsingMappedPrimaryKeyAttributes;
extern const struct SingleEntityRelatedToMappedEntityUsingMappedPrimaryKeyRelationships {
- NSString *mappedEntity;
+ __unsafe_unretained NSString *mappedEntity;
} SingleEntityRelatedToMappedEntityUsingMappedPrimaryKeyRelationships;
extern const struct SingleEntityRelatedToMappedEntityUsingMappedPrimaryKeyFetchedProperties {
@@ -30,7 +30,7 @@ extern const struct SingleEntityRelatedToMappedEntityUsingMappedPrimaryKeyFetche
-@property (nonatomic, retain) MappedEntity* mappedEntity;
+@property (nonatomic, strong) MappedEntity* mappedEntity;
//- (BOOL)validateMappedEntity:(id*)value_ error:(NSError**)error_;
View
4 .../Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.h
@@ -8,7 +8,7 @@ extern const struct SingleEntityRelatedToMappedEntityWithNestedMappedAttributesA
} SingleEntityRelatedToMappedEntityWithNestedMappedAttributesAttributes;
extern const struct SingleEntityRelatedToMappedEntityWithNestedMappedAttributesRelationships {
- NSString *mappedEntity;
+ __unsafe_unretained NSString *mappedEntity;
} SingleEntityRelatedToMappedEntityWithNestedMappedAttributesRelationships;
extern const struct SingleEntityRelatedToMappedEntityWithNestedMappedAttributesFetchedProperties {
@@ -30,7 +30,7 @@ extern const struct SingleEntityRelatedToMappedEntityWithNestedMappedAttributesF
-@property (nonatomic, retain) MappedEntity* mappedEntity;
+@property (nonatomic, strong) MappedEntity* mappedEntity;
//- (BOOL)validateMappedEntity:(id*)value_ error:(NSError**)error_;
View
8 ...Tests/Fixtures/iOS/TestEntities/_SingleEntityRelatedToMappedEntityWithSecondaryMappings.h
@@ -5,11 +5,11 @@
extern const struct SingleEntityRelatedToMappedEntityWithSecondaryMappingsAttributes {
- NSString *secondaryMappedAttribute;
+ __unsafe_unretained NSString *secondaryMappedAttribute;
} SingleEntityRelatedToMappedEntityWithSecondaryMappingsAttributes;
extern const struct SingleEntityRelatedToMappedEntityWithSecondaryMappingsRelationships {
- NSString *mappedRelationship;
+ __unsafe_unretained NSString *mappedRelationship;
} SingleEntityRelatedToMappedEntityWithSecondaryMappingsRelationships;
extern const struct SingleEntityRelatedToMappedEntityWithSecondaryMappingsFetchedProperties {
@@ -31,7 +31,7 @@ extern const struct SingleEntityRelatedToMappedEntityWithSecondaryMappingsFetche
-@property (nonatomic, retain) NSString *secondaryMappedAttribute;
+@property (nonatomic, strong) NSString *secondaryMappedAttribute;
//- (BOOL)validateSecondaryMappedAttribute:(id*)value_ error:(NSError**)error_;
@@ -40,7 +40,7 @@ extern const struct SingleEntityRelatedToMappedEntityWithSecondaryMappingsFetche
-@property (nonatomic, retain) MappedEntity* mappedRelationship;
+@property (nonatomic, strong) MappedEntity* mappedRelationship;
//- (BOOL)validateMappedRelationship:(id*)value_ error:(NSError**)error_;
View
56 Unit Tests/Fixtures/iOS/TestEntities/_SingleEntityWithNoRelationships.h
@@ -5,20 +5,20 @@
extern const struct SingleEntityWithNoRelationshipsAttributes {
- NSString *booleanTestAttribute;
- NSString *colorTestAttribute;
- NSString *dateTestAttribute;
- NSString *dateWithCustomFormat;
- NSString *decimalTestAttribute;
- NSString *doubleTestAttribute;
- NSString *floatTestAttribute;
- NSString *int16TestAttribute;
- NSString *int32TestAttribute;
- NSString *int64TestAttribute;
- NSString *mappedStringAttribute;
- NSString *notInJsonAttribute;
- NSString *nullTestAttribute;
- NSString *stringTestAttribute;
+ __unsafe_unretained NSString *booleanTestAttribute;
+ __unsafe_unretained NSString *colorTestAttribute;
+ __unsafe_unretained NSString *dateTestAttribute;
+ __unsafe_unretained NSString *dateWithCustomFormat;
+ __unsafe_unretained NSString *decimalTestAttribute;
+ __unsafe_unretained NSString *doubleTestAttribute;
+ __unsafe_unretained NSString *floatTestAttribute;
+ __unsafe_unretained NSString *int16TestAttribute;
+ __unsafe_unretained NSString *int32TestAttribute;
+ __unsafe_unretained NSString *int64TestAttribute;
+ __unsafe_unretained NSString *mappedStringAttribute;
+ __unsafe_unretained NSString *notInJsonAttribute;
+ __unsafe_unretained NSString *nullTestAttribute;
+ __unsafe_unretained NSString *stringTestAttribute;
} SingleEntityWithNoRelationshipsAttributes;
extern const struct SingleEntityWithNoRelationshipsRelationships {
@@ -55,7 +55,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSNumber *booleanTestAttribute;
+@property (nonatomic, strong) NSNumber *booleanTestAttribute;
@property BOOL booleanTestAttributeValue;
@@ -67,7 +67,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) UIColor *colorTestAttribute;
+@property (nonatomic, strong) UIColor *colorTestAttribute;
//- (BOOL)validateColorTestAttribute:(id*)value_ error:(NSError**)error_;
@@ -75,7 +75,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSDate *dateTestAttribute;
+@property (nonatomic, strong) NSDate *dateTestAttribute;
//- (BOOL)validateDateTestAttribute:(id*)value_ error:(NSError**)error_;
@@ -83,7 +83,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSDate *dateWithCustomFormat;
+@property (nonatomic, strong) NSDate *dateWithCustomFormat;
//- (BOOL)validateDateWithCustomFormat:(id*)value_ error:(NSError**)error_;
@@ -91,7 +91,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSDecimalNumber *decimalTestAttribute;
+@property (nonatomic, strong) NSDecimalNumber *decimalTestAttribute;
//- (BOOL)validateDecimalTestAttribute:(id*)value_ error:(NSError**)error_;
@@ -99,7 +99,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSNumber *doubleTestAttribute;
+@property (nonatomic, strong) NSNumber *doubleTestAttribute;
@property double doubleTestAttributeValue;
@@ -111,7 +111,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSNumber *floatTestAttribute;
+@property (nonatomic, strong) NSNumber *floatTestAttribute;
@property float floatTestAttributeValue;
@@ -123,7 +123,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSNumber *int16TestAttribute;
+@property (nonatomic, strong) NSNumber *int16TestAttribute;
@property short int16TestAttributeValue;
@@ -135,7 +135,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSNumber *int32TestAttribute;
+@property (nonatomic, strong) NSNumber *int32TestAttribute;
@property int int32TestAttributeValue;
@@ -147,7 +147,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSNumber *int64TestAttribute;
+@property (nonatomic, strong) NSNumber *int64TestAttribute;
@property long long int64TestAttributeValue;
@@ -159,7 +159,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSString *mappedStringAttribute;
+@property (nonatomic, strong) NSString *mappedStringAttribute;
//- (BOOL)validateMappedStringAttribute:(id*)value_ error:(NSError**)error_;
@@ -167,7 +167,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSString *notInJsonAttribute;
+@property (nonatomic, strong) NSString *notInJsonAttribute;
//- (BOOL)validateNotInJsonAttribute:(id*)value_ error:(NSError**)error_;
@@ -175,7 +175,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSNumber *nullTestAttribute;
+@property (nonatomic, strong) NSNumber *nullTestAttribute;
@property long long nullTestAttributeValue;
@@ -187,7 +187,7 @@ extern const struct SingleEntityWithNoRelationshipsFetchedProperties {
-@property (nonatomic, retain) NSString *stringTestAttribute;
+@property (nonatomic, strong) NSString *stringTestAttribute;
//- (BOOL)validateStringTestAttribute:(id*)value_ error:(NSError**)error_;
View
20 Unit Tests/Fixtures/iOS/TestEntities/_SingleRelatedEntity.h
@@ -5,14 +5,14 @@
extern const struct SingleRelatedEntityAttributes {
- NSString *mappedStringAttribute;
+ __unsafe_unretained NSString *mappedStringAttribute;
} SingleRelatedEntityAttributes;
extern const struct SingleRelatedEntityRelationships {
- NSString *testAbstractToManyRelationship;
- NSString *testAbstractToOneRelationship;
- NSString *testConcreteToManyRelationship;
- NSString *testConcreteToOneRelationship;
+ __unsafe_unretained NSString *testAbstractToManyRelationship;
+ __unsafe_unretained NSString *testAbstractToOneRelationship;
+ __unsafe_unretained NSString *testConcreteToManyRelationship;
+ __unsafe_unretained NSString *testConcreteToOneRelationship;
} SingleRelatedEntityRelationships;
extern const struct SingleRelatedEntityFetchedProperties {
@@ -37,7 +37,7 @@ extern const struct SingleRelatedEntityFetchedProperties {
-@property (nonatomic, retain) NSString *mappedStringAttribute;
+@property (nonatomic, strong) NSString *mappedStringAttribute;
//- (BOOL)validateMappedStringAttribute:(id*)value_ error:(NSError**)error_;
@@ -46,28 +46,28 @@ extern const struct SingleRelatedEntityFetchedProperties {
-@property (nonatomic, retain) NSSet* testAbstractToManyRelationship;
+@property (nonatomic, strong) NSSet* testAbstractToManyRelationship;
- (NSMutableSet*)testAbstractToManyRelationshipSet;
-@property (nonatomic, retain) AbstractRelatedEntity* testAbstractToOneRelationship;
+@property (nonatomic, strong) AbstractRelatedEntity* testAbstractToOneRelationship;
//- (BOOL)validateTestAbstractToOneRelationship:(id*)value_ error:(NSError**)error_;
-@property (nonatomic, retain) NSSet* testConcreteToManyRelationship;
+@property (nonatomic, strong) NSSet* testConcreteToManyRelationship;
- (NSMutableSet*)testConcreteToManyRelationshipSet;
-@property (nonatomic, retain) ConcreteRelatedEntity* testConcreteToOneRelationship;
+@property (nonatomic, strong) ConcreteRelatedEntity* testConcreteToOneRelationship;
//- (BOOL)validateTestConcreteToOneRelationship:(id*)value_ error:(NSError**)error_;

0 comments on commit bc4ae81

Please sign in to comment.
Something went wrong with that request. Please try again.