Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #631 from tonyarnold/develop

Cleanup of MagicalRecord 2
  • Loading branch information...
commit f5a1edcf2cb664d0aae8e9e22a34f3b9de9561d1 2 parents 001fe09 + 2c72a35
@casademora casademora authored
Showing with 607 additions and 268 deletions.
  1. +0 −1  .gitignore
  2. +5 −5 .gitmodules
  3. +2 −1  .travis.yml
  4. +176 −191 {Project Files → }/MagicalRecord.xcodeproj/project.pbxproj
  5. 0  {Project Files → }/MagicalRecord.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  6. +1 −1  {Project Files → }/MagicalRecord.xcodeproj/xcshareddata/xcschemes/MagicalRecordTests-OSX.xcscheme
  7. +1 −1  {Project Files → }/MagicalRecord.xcodeproj/xcshareddata/xcschemes/MagicalRecordTests-iOS.xcscheme
  8. +1 −1  {Project Files → }/MagicalRecord.xcodeproj/xcshareddata/xcschemes/libMagicalRecord-OSX.xcscheme
  9. +2 −2 {Project Files → }/MagicalRecord.xcodeproj/xcshareddata/xcschemes/libMagicalRecord-iOS.xcscheme
  10. +1 −0  MagicalRecord/Core/MagicalRecord.h
  11. +6 −1 MagicalRecord/Core/MagicalRecord.m
  12. +0 −3  MagicalRecord/CoreData+MagicalRecord.h
  13. +5 −0 MagicalRecord/MagicalRecordVersion.h
  14. BIN  Project Files/Default-568h@2x.png
  15. +0 −60 Project Files/Rakefile
  16. +0 −1  Project Files/Tests/Support/Vendor/Expecta
  17. 0  {Project Files/Library → }/Support/MagicalRecord-OSX-Prefix.pch
  18. 0  {Project Files/Library → }/Support/MagicalRecord-iOS-Prefix.pch
  19. 0  {Project Files → Support/Scripts}/generateShorthandFile.rb
  20. +18 −0 Support/Scripts/objc-build-scripts/LICENSE.md
  21. +82 −0 Support/Scripts/objc-build-scripts/README.md
  22. +80 −0 Support/Scripts/objc-build-scripts/bootstrap
  23. +142 −0 Support/Scripts/objc-build-scripts/cibuild
  24. +12 −0 Support/Scripts/objc-build-scripts/schemes.awk
  25. +12 −0 Support/Scripts/objc-build-scripts/targets.awk
  26. +35 −0 Support/Scripts/objc-build-scripts/xcodebuild.awk
  27. +25 −0 Support/Scripts/objc-build-scripts/xctool.awk
  28. 0  {Project Files → }/Tests/Core/MagicalRecordStackTests.m
  29. 0  {Project Files → }/Tests/Core/MagicalRecordTestBase.h
  30. 0  {Project Files → }/Tests/Core/MagicalRecordTestBase.m
  31. 0  {Project Files → }/Tests/Core/NSManagedObjectContextHelperTests.m
  32. 0  {Project Files → }/Tests/Core/NSManagedObjectHelperTests.m
  33. 0  {Project Files → }/Tests/Core/NSPersisentStoreHelperTests.m
  34. 0  {Project Files → }/Tests/Core/NSPersistentStoreCoordinatorHelperTests.m
  35. 0  ...t Files → }/Tests/DataImport/ImportSingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyTests.m
  36. 0  {Project Files → }/Tests/DataImport/ImportSingleEntityRelatedToMappedEntityUsingDefaultsTests.m
  37. 0  {Project Files → }/Tests/DataImport/ImportSingleEntityRelatedToMappedEntityUsingMappedPrimaryKeyTests.m
  38. 0  ...ct Files → }/Tests/DataImport/ImportSingleEntityRelatedToMappedEntityWithNestedMappedAttributesTests.m
  39. 0  {Project Files → }/Tests/DataImport/ImportSingleEntityRelatedToMappedEntityWithSecondaryMappingsTests.m
  40. 0  {Project Files → }/Tests/DataImport/ImportSingleEntityWithNoRelationshipsTests.m
  41. 0  {Project Files → }/Tests/DataImport/ImportSingleRelatedEntityTests.m
  42. 0  {Project Files → }/Tests/DataImport/MagicalDataImportTestCase.h
  43. 0  {Project Files → }/Tests/DataImport/MagicalDataImportTestCase.m
  44. 0  {Project Files → }/Tests/Fixtures/FixtureHelpers.h
  45. 0  {Project Files → }/Tests/Fixtures/FixtureHelpers.m
  46. 0  ...ct Files → }/Tests/Fixtures/ImportSingleEntityRelatedToManyMappedEntitiesUsingListOfPrimaryKeysTests.m
  47. 0  {Project Files → }/Tests/Fixtures/SampleJSONDataForImport.json
  48. 0  {Project Files → }/Tests/Fixtures/SingleEntityRelatedToManyMappedEntitiesUsingListOfPrimaryKeys.json
  49. 0  {Project Files → }/Tests/Fixtures/SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.json
  50. 0  {Project Files → }/Tests/Fixtures/SingleEntityRelatedToMappedEntityUsingDefaults.json
  51. 0  {Project Files → }/Tests/Fixtures/SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.json
  52. 0  {Project Files → }/Tests/Fixtures/SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.json
  53. 0  {Project Files → }/Tests/Fixtures/SingleEntityRelatedToMappedEntityWithSecondaryMappings.json
  54. 0  {Project Files → }/Tests/Fixtures/SingleEntityWithNoRelationships.json
  55. 0  {Project Files → }/Tests/Fixtures/SingleEntityWithNoRelationships.plist
  56. 0  {Project Files → }/Tests/Fixtures/SingleRelatedEntity.json
  57. 0  {Project Files → }/Tests/Fixtures/TestModel.xcdatamodeld/TestModel.xcdatamodel/contents
  58. 0  {Project Files → }/Tests/Fixtures/TestModel/AbstractRelatedEntity.h
  59. 0  {Project Files → }/Tests/Fixtures/TestModel/AbstractRelatedEntity.m
  60. 0  {Project Files → }/Tests/Fixtures/TestModel/ConcreteRelatedEntity.h
  61. 0  {Project Files → }/Tests/Fixtures/TestModel/ConcreteRelatedEntity.m
  62. 0  {Project Files → }/Tests/Fixtures/TestModel/DifferentClassNameMapping.h
  63. 0  {Project Files → }/Tests/Fixtures/TestModel/DifferentClassNameMapping.m
  64. 0  {Project Files → }/Tests/Fixtures/TestModel/MappedEntity.h
  65. 0  {Project Files → }/Tests/Fixtures/TestModel/MappedEntity.m
  66. 0  ...ject Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.h
  67. 0  ...ject Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.m
  68. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityUsingDefaults.h
  69. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityUsingDefaults.m
  70. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.h
  71. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.m
  72. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.h
  73. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.m
  74. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityWithSecondaryMappings.h
  75. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityRelatedToMappedEntityWithSecondaryMappings.m
  76. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityWithNoRelationships.h
  77. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleEntityWithNoRelationships.m
  78. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleRelatedEntity.h
  79. 0  {Project Files → }/Tests/Fixtures/TestModel/SingleRelatedEntity.m
  80. 0  {Project Files → }/Tests/Fixtures/TestModel/_AbstractRelatedEntity.h
  81. 0  {Project Files → }/Tests/Fixtures/TestModel/_AbstractRelatedEntity.m
  82. 0  {Project Files → }/Tests/Fixtures/TestModel/_ConcreteRelatedEntity.h
  83. 0  {Project Files → }/Tests/Fixtures/TestModel/_ConcreteRelatedEntity.m
  84. 0  {Project Files → }/Tests/Fixtures/TestModel/_DifferentClassNameMapping.h
  85. 0  {Project Files → }/Tests/Fixtures/TestModel/_DifferentClassNameMapping.m
  86. 0  {Project Files → }/Tests/Fixtures/TestModel/_MappedEntity.h
  87. 0  {Project Files → }/Tests/Fixtures/TestModel/_MappedEntity.m
  88. 0  ...ect Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.h
  89. 0  ...ect Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.m
  90. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityUsingDefaults.h
  91. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityUsingDefaults.m
  92. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.h
  93. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityUsingMappedPrimaryKey.m
  94. 0  ...ject Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.h
  95. 0  ...ject Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityWithNestedMappedAttributes.m
  96. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityWithSecondaryMappings.h
  97. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityRelatedToMappedEntityWithSecondaryMappings.m
  98. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityWithNoRelationships.h
  99. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleEntityWithNoRelationships.m
  100. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleRelatedEntity.h
  101. 0  {Project Files → }/Tests/Fixtures/TestModel/_SingleRelatedEntity.m
  102. 0  {Project Files → }/Tests/MagicalRecord+ActionsSpec.m
  103. 0  {Project Files → }/Tests/NSManagedObjectContext+MagicalSavesSpec.m
  104. 0  {Project Files → }/Tests/Support/MagicalRecordTests-OSX-Info.plist
  105. 0  {Project Files → }/Tests/Support/MagicalRecordTests-OSX-Prefix.pch
  106. 0  {Project Files → }/Tests/Support/MagicalRecordTests-iOS-Info.plist
  107. 0  {Project Files → }/Tests/Support/MagicalRecordTests-iOS-Prefix.pch
  108. +1 −0  Tests/Vendor/Expecta
  109. 0  {Project Files/Tests/Support → Tests}/Vendor/Specta
View
1  .gitignore
@@ -18,4 +18,3 @@ profile
*.moved-aside
DerivedData
-BuildConfig.h
View
10 .gitmodules
@@ -1,6 +1,6 @@
-[submodule "Project Files/Tests/Support/Vendor/Expecta"]
- path = Project Files/Tests/Support/Vendor/Expecta
-url=https://github.com/specta/expecta.git
-[submodule "Project Files/Tests/Support/Vendor/Specta"]
- path = Project Files/Tests/Support/Vendor/Specta
+[submodule "Tests/Vendor/Expecta"]
+ path = Tests/Vendor/Expecta
+url=https://github.com/tonyarnold/expecta.git
+[submodule "Tests/Vendor/Specta"]
+ path = Tests/Vendor/Specta
url = https://github.com/specta/specta.git
View
3  .travis.yml
@@ -1 +1,2 @@
-language: objective-c
+language: objective-c
+script: Support/Scripts/objc-build-scripts/cibuild
View
367 ...ect Files/MagicalRecord.xcodeproj/project.pbxproj → MagicalRecord.xcodeproj/project.pbxproj
@@ -13,6 +13,11 @@
90171E1C17C329CD00E7084A /* FixtureHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF9B6C17498B5C008D9D13 /* FixtureHelpers.m */; };
90171E1D17C32ACE00E7084A /* TestModel.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = 9099490817C2F3D400BC2B5C /* TestModel.xcdatamodeld */; };
90171E1E17C32AD300E7084A /* TestModel.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = 9099490817C2F3D400BC2B5C /* TestModel.xcdatamodeld */; };
+ 904254A718710ADE0066DA41 /* libExpecta-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 90425480187103F00066DA41 /* libExpecta-iOS.a */; };
+ 904254A818710ADE0066DA41 /* libSpecta-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9042548F187103F40066DA41 /* libSpecta-iOS.a */; };
+ 904254A918710B1A0066DA41 /* libExpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9042547E187103F00066DA41 /* libExpecta.a */; };
+ 904254AA18710B1A0066DA41 /* libSpecta-OSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 90425491187103F40066DA41 /* libSpecta-OSX.a */; };
+ 904254AB18710B210066DA41 /* libMagicalRecord-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C7CF97AB17498414008D9D13 /* libMagicalRecord-iOS.a */; };
90542E121863F20900916224 /* MagicalDataImportTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF978E174982AD008D9D13 /* MagicalDataImportTestCase.m */; };
90542E131863F20900916224 /* MagicalDataImportTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF978E174982AD008D9D13 /* MagicalDataImportTestCase.m */; };
90542E141863F20C00916224 /* ImportSingleEntityWithNoRelationshipsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF978B174982AD008D9D13 /* ImportSingleEntityWithNoRelationshipsTests.m */; };
@@ -33,7 +38,6 @@
90542E251864894D00916224 /* NSPersisentStoreHelperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF977017498275008D9D13 /* NSPersisentStoreHelperTests.m */; };
90542E2618648AAF00916224 /* NSPersistentStoreCoordinatorHelperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF977217498275008D9D13 /* NSPersistentStoreCoordinatorHelperTests.m */; };
90542E2718648AB000916224 /* NSPersistentStoreCoordinatorHelperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF977217498275008D9D13 /* NSPersistentStoreCoordinatorHelperTests.m */; };
- 9069F698186317BB0092E58C /* libSpecta-OSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 90B281D5186316E8004D9550 /* libSpecta-OSX.a */; };
909948F717C2EFA100BC2B5C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 909B48C817C2EB5C00CE8C5E /* Cocoa.framework */; };
909948F817C2EFA500BC2B5C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C721C7E213D0C3A00097AB6F /* CoreData.framework */; };
9099490217C2F0B700BC2B5C /* MagicalRecord+ActionsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 909948FF17C2F0B700BC2B5C /* MagicalRecord+ActionsSpec.m */; };
@@ -84,11 +88,7 @@
9099496217C2F42100BC2B5C /* SingleEntityWithNoRelationships.m in Sources */ = {isa = PBXBuildFile; fileRef = 9099493617C2F42100BC2B5C /* SingleEntityWithNoRelationships.m */; };
9099496317C2F42100BC2B5C /* SingleRelatedEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 9099493817C2F42100BC2B5C /* SingleRelatedEntity.m */; };
9099496417C2F42100BC2B5C /* SingleRelatedEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 9099493817C2F42100BC2B5C /* SingleRelatedEntity.m */; };
- 9099496A17C2FD5000BC2B5C /* liblibMagicalRecord-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C7CF97AB17498414008D9D13 /* liblibMagicalRecord-iOS.a */; };
9099496B17C2FD5500BC2B5C /* libMagicalRecord-OSX.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C7CF97BB1749843F008D9D13 /* libMagicalRecord-OSX.dylib */; };
- 909B48C617C2EB5000CE8C5E /* libExpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C7CF9B01174988D0008D9D13 /* libExpecta.a */; };
- 90B281DA18631710004D9550 /* libExpecta-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C7CF9B03174988D0008D9D13 /* libExpecta-iOS.a */; };
- 90B281DB18631710004D9550 /* libSpecta-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 909B48C117C2EB4400CE8C5E /* libSpecta-iOS.a */; };
90BB1C3A1864F341001BBFBB /* ImportSingleEntityRelatedToMappedEntityUsingDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF9787174982AD008D9D13 /* ImportSingleEntityRelatedToMappedEntityUsingDefaultsTests.m */; };
90BB1C3B1864F341001BBFBB /* ImportSingleEntityRelatedToMappedEntityUsingDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF9787174982AD008D9D13 /* ImportSingleEntityRelatedToMappedEntityUsingDefaultsTests.m */; };
90BB1C3C1864F3E9001BBFBB /* ImportSingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C7CF9786174982AD008D9D13 /* ImportSingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKeyTests.m */; };
@@ -158,7 +158,6 @@
C7CF97F7174984A5008D9D13 /* MagicalRecord+Options.m in Sources */ = {isa = PBXBuildFile; fileRef = C7DD72CC150F832A00216827 /* MagicalRecord+Options.m */; };
C7CF97F8174984A5008D9D13 /* MagicalRecord+Setup.m in Sources */ = {isa = PBXBuildFile; fileRef = C7DD72CE150F832A00216827 /* MagicalRecord+Setup.m */; };
C7CF97F9174984A5008D9D13 /* MagicalRecord+ShorthandSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C7DD72D0150F832A00216827 /* MagicalRecord+ShorthandSupport.m */; };
- C7CF9AE6174986B5008D9D13 /* MagicalRecord-OSX-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = C7CF9AE4174986B5008D9D13 /* MagicalRecord-OSX-Prefix.pch */; };
C7CF9B5317498985008D9D13 /* SampleJSONDataForImport.json in Resources */ = {isa = PBXBuildFile; fileRef = C7CF9B4917498985008D9D13 /* SampleJSONDataForImport.json */; };
C7CF9B5417498985008D9D13 /* SampleJSONDataForImport.json in Resources */ = {isa = PBXBuildFile; fileRef = C7CF9B4917498985008D9D13 /* SampleJSONDataForImport.json */; };
C7CF9B5517498985008D9D13 /* SingleEntityRelatedToManyMappedEntitiesUsingListOfPrimaryKeys.json in Resources */ = {isa = PBXBuildFile; fileRef = C7CF9B4A17498985008D9D13 /* SingleEntityRelatedToManyMappedEntitiesUsingListOfPrimaryKeys.json */; };
@@ -182,82 +181,82 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 9099496C17C2FD5C00BC2B5C /* PBXContainerItemProxy */ = {
+ 9042547D187103F00066DA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = C721C7A213D0A3750097AB6F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C7CF97BA1749843F008D9D13;
- remoteInfo = "libMagicalRecord-OSX";
+ containerPortal = 90425475187103EF0066DA41 /* Expecta.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = E9ACDF0C13B2DD520010F4D7;
+ remoteInfo = Expecta;
};
- 9099496E17C2FD6100BC2B5C /* PBXContainerItemProxy */ = {
+ 9042547F187103F00066DA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = C721C7A213D0A3750097AB6F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C7CF97AA17498414008D9D13;
- remoteInfo = "libMagicalRecord-iOS";
+ containerPortal = 90425475187103EF0066DA41 /* Expecta.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = E93067CE13B2E6D100EA26FF;
+ remoteInfo = "Expecta-iOS";
};
- 909B48C017C2EB4400CE8C5E /* PBXContainerItemProxy */ = {
+ 90425481187103F00066DA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 909B48AF17C2EB4300CE8C5E /* Specta.xcodeproj */;
+ containerPortal = 90425475187103EF0066DA41 /* Expecta.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E9B777A414BA294B00D8DC76;
- remoteInfo = "Specta-iOS";
+ remoteGlobalIDString = E9ACDF1D13B2DD520010F4D7;
+ remoteInfo = ExpectaTests;
};
- 90B281CE186316E8004D9550 /* PBXContainerItemProxy */ = {
+ 90425483187103F00066DA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */;
+ containerPortal = 90425475187103EF0066DA41 /* Expecta.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = E93067DA13B2E6D100EA26FF;
+ remoteInfo = "Expecta-iOSTests";
+ };
+ 90425485187103F00066DA41 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 90425475187103EF0066DA41 /* Expecta.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 9C4416F917FF3F4A00978F09;
remoteInfo = "ExpectaTests-XCTest";
};
- 90B281D4186316E8004D9550 /* PBXContainerItemProxy */ = {
+ 9042548E187103F40066DA41 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 90425487187103F40066DA41 /* Specta.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = E9901BFD18205A3500844A05;
+ remoteInfo = "Specta-iOS";
+ };
+ 90425490187103F40066DA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 909B48AF17C2EB4300CE8C5E /* Specta.xcodeproj */;
+ containerPortal = 90425487187103F40066DA41 /* Specta.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = E9901C2A18205AB100844A05;
remoteInfo = "Specta-OSX";
};
- 90B281D6186316E8004D9550 /* PBXContainerItemProxy */ = {
+ 90425492187103F40066DA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 909B48AF17C2EB4300CE8C5E /* Specta.xcodeproj */;
+ containerPortal = 90425487187103F40066DA41 /* Specta.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = E9901C0D18205A3500844A05;
remoteInfo = "SpectaTests-iOS";
};
- 90B281D8186316E8004D9550 /* PBXContainerItemProxy */ = {
+ 90425494187103F40066DA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 909B48AF17C2EB4300CE8C5E /* Specta.xcodeproj */;
+ containerPortal = 90425487187103F40066DA41 /* Specta.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = E9901C3B18205AB100844A05;
remoteInfo = "Specta-OSXTests";
};
- C7CF9B00174988D0008D9D13 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9ACDF0C13B2DD520010F4D7;
- remoteInfo = Expecta;
- };
- C7CF9B02174988D0008D9D13 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E93067CE13B2E6D100EA26FF;
- remoteInfo = "Expecta-iOS";
- };
- C7CF9B04174988D0008D9D13 /* PBXContainerItemProxy */ = {
+ 9099496C17C2FD5C00BC2B5C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9ACDF1D13B2DD520010F4D7;
- remoteInfo = ExpectaTests;
+ containerPortal = C721C7A213D0A3750097AB6F /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = C7CF97BA1749843F008D9D13;
+ remoteInfo = "libMagicalRecord-OSX";
};
- C7CF9B06174988D0008D9D13 /* PBXContainerItemProxy */ = {
+ 9099496E17C2FD6100BC2B5C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E93067DA13B2E6D100EA26FF;
- remoteInfo = "Expecta-iOSTests";
+ containerPortal = C721C7A213D0A3750097AB6F /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = C7CF97AA17498414008D9D13;
+ remoteInfo = "libMagicalRecord-iOS";
};
/* End PBXContainerItemProxy section */
@@ -274,7 +273,15 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 9042530D187002710066DA41 /* BuildConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BuildConfig.h; sourceTree = SOURCE_ROOT; };
+ 90425375187102DC0066DA41 /* MagicalRecord-iOS-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MagicalRecord-iOS-Prefix.pch"; sourceTree = "<group>"; };
+ 90425376187102DC0066DA41 /* MagicalRecord-OSX-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MagicalRecord-OSX-Prefix.pch"; sourceTree = "<group>"; };
+ 90425377187103060066DA41 /* MagicalRecordVersion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MagicalRecordVersion.h; sourceTree = "<group>"; };
+ 90425379187103D00066DA41 /* MagicalRecordTests-iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MagicalRecordTests-iOS-Info.plist"; sourceTree = "<group>"; };
+ 9042537A187103D00066DA41 /* MagicalRecordTests-iOS-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MagicalRecordTests-iOS-Prefix.pch"; sourceTree = "<group>"; };
+ 9042537B187103D00066DA41 /* MagicalRecordTests-OSX-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MagicalRecordTests-OSX-Info.plist"; sourceTree = "<group>"; };
+ 9042537C187103D00066DA41 /* MagicalRecordTests-OSX-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MagicalRecordTests-OSX-Prefix.pch"; sourceTree = "<group>"; };
+ 90425475187103EF0066DA41 /* Expecta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Expecta.xcodeproj; path = Expecta/Expecta.xcodeproj; sourceTree = "<group>"; };
+ 90425487187103F40066DA41 /* Specta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Specta.xcodeproj; path = Specta/Specta.xcodeproj; sourceTree = "<group>"; };
909948F517C2EF9800BC2B5C /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
909948FF17C2F0B700BC2B5C /* MagicalRecord+ActionsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "MagicalRecord+ActionsSpec.m"; path = "Tests/MagicalRecord+ActionsSpec.m"; sourceTree = SOURCE_ROOT; };
9099490017C2F0B700BC2B5C /* NSManagedObjectContext+MagicalSavesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSManagedObjectContext+MagicalSavesSpec.m"; path = "Tests/NSManagedObjectContext+MagicalSavesSpec.m"; sourceTree = SOURCE_ROOT; };
@@ -324,7 +331,6 @@
9099493717C2F42100BC2B5C /* SingleRelatedEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleRelatedEntity.h; sourceTree = "<group>"; };
9099493817C2F42100BC2B5C /* SingleRelatedEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleRelatedEntity.m; sourceTree = "<group>"; };
9099497217C3044700BC2B5C /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
- 909B48AF17C2EB4300CE8C5E /* Specta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Specta.xcodeproj; path = Specta/Specta.xcodeproj; sourceTree = "<group>"; };
909B48C817C2EB5C00CE8C5E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
909B48CA17C2EC7E00CE8C5E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
90BB1C3E1864F662001BBFBB /* ImportSingleRelatedEntityTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImportSingleRelatedEntityTests.m; sourceTree = "<group>"; };
@@ -333,8 +339,6 @@
90EFB46D1863DBD400B04F5C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
C721C7E213D0C3A00097AB6F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
C721C7E313D0C3A00097AB6F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
- C75C7D69147220D300D0C2FE /* generateShorthandFile.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = generateShorthandFile.rb; sourceTree = "<group>"; };
- C7CF963C174963D0008D9D13 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
C7CF976817498275008D9D13 /* MagicalRecordStackTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MagicalRecordStackTests.m; sourceTree = "<group>"; };
C7CF976A17498275008D9D13 /* NSManagedObjectContextHelperTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSManagedObjectContextHelperTests.m; sourceTree = "<group>"; };
C7CF976C17498275008D9D13 /* NSManagedObjectHelperTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSManagedObjectHelperTests.m; sourceTree = "<group>"; };
@@ -348,15 +352,10 @@
C7CF978B174982AD008D9D13 /* ImportSingleEntityWithNoRelationshipsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImportSingleEntityWithNoRelationshipsTests.m; sourceTree = "<group>"; };
C7CF978D174982AD008D9D13 /* MagicalDataImportTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MagicalDataImportTestCase.h; sourceTree = "<group>"; };
C7CF978E174982AD008D9D13 /* MagicalDataImportTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MagicalDataImportTestCase.m; sourceTree = "<group>"; };
- C7CF97AB17498414008D9D13 /* liblibMagicalRecord-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "liblibMagicalRecord-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+ C7CF97AB17498414008D9D13 /* libMagicalRecord-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libMagicalRecord-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
C7CF97BB1749843F008D9D13 /* libMagicalRecord-OSX.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libMagicalRecord-OSX.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
C7CF97FF174984CA008D9D13 /* MagicalRecordTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "MagicalRecordTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
C7CF9816174984E4008D9D13 /* MagicalRecordTests-OSX.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "MagicalRecordTests-OSX.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
- C7CF9ADF17498650008D9D13 /* MagicalRecordTests-iOS-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MagicalRecordTests-iOS-Prefix.pch"; sourceTree = "<group>"; };
- C7CF9AE017498650008D9D13 /* MagicalRecordTests-OSX-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MagicalRecordTests-OSX-Prefix.pch"; sourceTree = "<group>"; };
- C7CF9AE3174986B5008D9D13 /* MagicalRecord-iOS-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MagicalRecord-iOS-Prefix.pch"; sourceTree = "<group>"; };
- C7CF9AE4174986B5008D9D13 /* MagicalRecord-OSX-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MagicalRecord-OSX-Prefix.pch"; sourceTree = "<group>"; };
- C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Expecta.xcodeproj; path = Expecta/Expecta.xcodeproj; sourceTree = "<group>"; };
C7CF9B4917498985008D9D13 /* SampleJSONDataForImport.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = SampleJSONDataForImport.json; path = Fixtures/SampleJSONDataForImport.json; sourceTree = "<group>"; };
C7CF9B4A17498985008D9D13 /* SingleEntityRelatedToManyMappedEntitiesUsingListOfPrimaryKeys.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = SingleEntityRelatedToManyMappedEntitiesUsingListOfPrimaryKeys.json; path = Fixtures/SingleEntityRelatedToManyMappedEntitiesUsingListOfPrimaryKeys.json; sourceTree = "<group>"; };
C7CF9B4B17498985008D9D13 /* SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.json; path = Fixtures/SingleEntityRelatedToManyMappedEntitiesUsingMappedPrimaryKey.json; sourceTree = "<group>"; };
@@ -369,8 +368,6 @@
C7CF9B5217498985008D9D13 /* SingleRelatedEntity.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = SingleRelatedEntity.json; path = Fixtures/SingleRelatedEntity.json; sourceTree = "<group>"; };
C7CF9B6B17498B5C008D9D13 /* FixtureHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FixtureHelpers.h; path = Fixtures/FixtureHelpers.h; sourceTree = "<group>"; };
C7CF9B6C17498B5C008D9D13 /* FixtureHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FixtureHelpers.m; path = Fixtures/FixtureHelpers.m; sourceTree = "<group>"; };
- C7CF9B6F17498B83008D9D13 /* MagicalRecordTests-iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MagicalRecordTests-iOS-Info.plist"; sourceTree = "<group>"; };
- C7CF9B7017498B83008D9D13 /* MagicalRecordTests-OSX-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MagicalRecordTests-OSX-Info.plist"; sourceTree = "<group>"; };
C7DD729C150F832A00216827 /* MagicalImportFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MagicalImportFunctions.h; sourceTree = "<group>"; };
C7DD729D150F832A00216827 /* MagicalImportFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MagicalImportFunctions.m; sourceTree = "<group>"; };
C7DD729E150F832A00216827 /* NSAttributeDescription+MagicalDataImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSAttributeDescription+MagicalDataImport.h"; sourceTree = "<group>"; };
@@ -450,13 +447,13 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 904254AB18710B210066DA41 /* libMagicalRecord-iOS.a in Frameworks */,
+ 904254A718710ADE0066DA41 /* libExpecta-iOS.a in Frameworks */,
+ 904254A818710ADE0066DA41 /* libSpecta-iOS.a in Frameworks */,
90EFB46E1863DBD400B04F5C /* Foundation.framework in Frameworks */,
90EFB46C1863DBD000B04F5C /* UIKit.framework in Frameworks */,
90EFB46A1863BE2300B04F5C /* CoreData.framework in Frameworks */,
90EFB47D1863DE1B00B04F5C /* XCTest.framework in Frameworks */,
- 9099496A17C2FD5000BC2B5C /* liblibMagicalRecord-iOS.a in Frameworks */,
- 90B281DA18631710004D9550 /* libExpecta-iOS.a in Frameworks */,
- 90B281DB18631710004D9550 /* libSpecta-iOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -464,18 +461,70 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 904254A918710B1A0066DA41 /* libExpecta.a in Frameworks */,
+ 904254AA18710B1A0066DA41 /* libSpecta-OSX.a in Frameworks */,
90FE37081863BC7800C9E638 /* Cocoa.framework in Frameworks */,
90FE37091863BC7E00C9E638 /* CoreData.framework in Frameworks */,
90FE37071863BC7100C9E638 /* XCTest.framework in Frameworks */,
9099496B17C2FD5500BC2B5C /* libMagicalRecord-OSX.dylib in Frameworks */,
- 909B48C617C2EB5000CE8C5E /* libExpecta.a in Frameworks */,
- 9069F698186317BB0092E58C /* libSpecta-OSX.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 90425374187102DC0066DA41 /* Support */ = {
+ isa = PBXGroup;
+ children = (
+ 90425375187102DC0066DA41 /* MagicalRecord-iOS-Prefix.pch */,
+ 90425376187102DC0066DA41 /* MagicalRecord-OSX-Prefix.pch */,
+ );
+ path = Support;
+ sourceTree = "<group>";
+ };
+ 90425378187103D00066DA41 /* Support */ = {
+ isa = PBXGroup;
+ children = (
+ 90425379187103D00066DA41 /* MagicalRecordTests-iOS-Info.plist */,
+ 9042537A187103D00066DA41 /* MagicalRecordTests-iOS-Prefix.pch */,
+ 9042537B187103D00066DA41 /* MagicalRecordTests-OSX-Info.plist */,
+ 9042537C187103D00066DA41 /* MagicalRecordTests-OSX-Prefix.pch */,
+ );
+ path = Support;
+ sourceTree = "<group>";
+ };
+ 9042537E187103E60066DA41 /* Vendor */ = {
+ isa = PBXGroup;
+ children = (
+ 90425475187103EF0066DA41 /* Expecta.xcodeproj */,
+ 90425487187103F40066DA41 /* Specta.xcodeproj */,
+ );
+ path = Vendor;
+ sourceTree = "<group>";
+ };
+ 90425476187103EF0066DA41 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 9042547E187103F00066DA41 /* libExpecta.a */,
+ 90425480187103F00066DA41 /* libExpecta-iOS.a */,
+ 90425482187103F00066DA41 /* ExpectaTests.octest */,
+ 90425484187103F00066DA41 /* Expecta-iOSTests.octest */,
+ 90425486187103F00066DA41 /* ExpectaTests-XCTest.xctest */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 90425488187103F40066DA41 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 9042548F187103F40066DA41 /* libSpecta-iOS.a */,
+ 90425491187103F40066DA41 /* libSpecta-OSX.a */,
+ 90425493187103F40066DA41 /* SpectaTests-iOS.xctest */,
+ 90425495187103F40066DA41 /* Specta-OSXTests.xctest */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
9099490C17C2F42100BC2B5C /* TestModel */ = {
isa = PBXGroup;
children = (
@@ -528,17 +577,6 @@
path = Fixtures/TestModel;
sourceTree = "<group>";
};
- 909B48B017C2EB4300CE8C5E /* Products */ = {
- isa = PBXGroup;
- children = (
- 909B48C117C2EB4400CE8C5E /* libSpecta-iOS.a */,
- 90B281D5186316E8004D9550 /* libSpecta-OSX.a */,
- 90B281D7186316E8004D9550 /* SpectaTests-iOS.xctest */,
- 90B281D9186316E8004D9550 /* Specta-OSXTests.xctest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
90BB1C4418651512001BBFBB /* Specs */ = {
isa = PBXGroup;
children = (
@@ -571,20 +609,18 @@
C721C7A013D0A3750097AB6F = {
isa = PBXGroup;
children = (
- C7CF963C174963D0008D9D13 /* Default-568h@2x.png */,
- C75C7D69147220D300D0C2FE /* generateShorthandFile.rb */,
- C7CF9AE11749867D008D9D13 /* Library */,
C7DD7299150F832A00216827 /* MagicalRecord */,
C77E5FA513D0CBA600298F87 /* Tests */,
- C721C7B313D0A3AF0097AB6F /* Frameworks */,
+ 90425374187102DC0066DA41 /* Support */,
C721C7B113D0A3AF0097AB6F /* Products */,
+ C721C7B313D0A3AF0097AB6F /* Frameworks */,
);
sourceTree = "<group>";
};
C721C7B113D0A3AF0097AB6F /* Products */ = {
isa = PBXGroup;
children = (
- C7CF97AB17498414008D9D13 /* liblibMagicalRecord-iOS.a */,
+ C7CF97AB17498414008D9D13 /* libMagicalRecord-iOS.a */,
C7CF97BB1749843F008D9D13 /* libMagicalRecord-OSX.dylib */,
C7CF97FF174984CA008D9D13 /* MagicalRecordTests-iOS.xctest */,
C7CF9816174984E4008D9D13 /* MagicalRecordTests-OSX.xctest */,
@@ -605,10 +641,11 @@
C77E5FA513D0CBA600298F87 /* Tests */ = {
isa = PBXGroup;
children = (
- C7CF9826174985FC008D9D13 /* Support */,
C7CF976617498275008D9D13 /* Core */,
C7CF9785174982AD008D9D13 /* DataImport */,
C77E5FA913D0CBE300298F87 /* Fixtures */,
+ 90425378187103D00066DA41 /* Support */,
+ 9042537E187103E60066DA41 /* Vendor */,
);
path = Tests;
sourceTree = "<group>";
@@ -681,66 +718,15 @@
path = DataImport;
sourceTree = "<group>";
};
- C7CF9826174985FC008D9D13 /* Support */ = {
- isa = PBXGroup;
- children = (
- C7CF9B6F17498B83008D9D13 /* MagicalRecordTests-iOS-Info.plist */,
- C7CF9B7017498B83008D9D13 /* MagicalRecordTests-OSX-Info.plist */,
- C7CF9ADF17498650008D9D13 /* MagicalRecordTests-iOS-Prefix.pch */,
- C7CF9AE017498650008D9D13 /* MagicalRecordTests-OSX-Prefix.pch */,
- C7CF982B174985FC008D9D13 /* Vendor */,
- );
- path = Support;
- sourceTree = "<group>";
- };
- C7CF982B174985FC008D9D13 /* Vendor */ = {
- isa = PBXGroup;
- children = (
- C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */,
- 909B48AF17C2EB4300CE8C5E /* Specta.xcodeproj */,
- );
- path = Vendor;
- sourceTree = "<group>";
- };
- C7CF9AE11749867D008D9D13 /* Library */ = {
- isa = PBXGroup;
- children = (
- C7CF9AE21749867D008D9D13 /* Support */,
- );
- path = Library;
- sourceTree = "<group>";
- };
- C7CF9AE21749867D008D9D13 /* Support */ = {
- isa = PBXGroup;
- children = (
- 9042530D187002710066DA41 /* BuildConfig.h */,
- C7CF9AE3174986B5008D9D13 /* MagicalRecord-iOS-Prefix.pch */,
- C7CF9AE4174986B5008D9D13 /* MagicalRecord-OSX-Prefix.pch */,
- );
- path = Support;
- sourceTree = "<group>";
- };
- C7CF9AFA174988CF008D9D13 /* Products */ = {
- isa = PBXGroup;
- children = (
- C7CF9B01174988D0008D9D13 /* libExpecta.a */,
- C7CF9B03174988D0008D9D13 /* libExpecta-iOS.a */,
- C7CF9B05174988D0008D9D13 /* ExpectaTests.octest */,
- C7CF9B07174988D0008D9D13 /* Expecta-iOSTests.octest */,
- 90B281CF186316E8004D9550 /* ExpectaTests-XCTest.xctest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
C7DD7299150F832A00216827 /* MagicalRecord */ = {
isa = PBXGroup;
children = (
C7DD729A150F832A00216827 /* Categories */,
C7DD72C4150F832A00216827 /* Core */,
C7DD72D4150F832A00216827 /* CoreData+MagicalRecord.h */,
+ 90425377187103060066DA41 /* MagicalRecordVersion.h */,
);
- name = MagicalRecord;
- path = ../MagicalRecord;
+ path = MagicalRecord;
sourceTree = "<group>";
};
C7DD729A150F832A00216827 /* Categories */ = {
@@ -841,7 +827,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- C7CF9AE6174986B5008D9D13 /* MagicalRecord-OSX-Prefix.pch in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -863,7 +848,7 @@
);
name = "libMagicalRecord-iOS";
productName = libMagicalRecord;
- productReference = C7CF97AB17498414008D9D13 /* liblibMagicalRecord-iOS.a */;
+ productReference = C7CF97AB17498414008D9D13 /* libMagicalRecord-iOS.a */;
productType = "com.apple.product-type.library.static";
};
C7CF97BA1749843F008D9D13 /* libMagicalRecord-OSX */ = {
@@ -926,7 +911,7 @@
C721C7A213D0A3750097AB6F /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Magical Panda Software LLC";
};
buildConfigurationList = C721C7A513D0A3750097AB6F /* Build configuration list for PBXProject "MagicalRecord" */;
@@ -941,12 +926,12 @@
projectDirPath = "";
projectReferences = (
{
- ProductGroup = C7CF9AFA174988CF008D9D13 /* Products */;
- ProjectRef = C7CF9AF9174988CF008D9D13 /* Expecta.xcodeproj */;
+ ProductGroup = 90425476187103EF0066DA41 /* Products */;
+ ProjectRef = 90425475187103EF0066DA41 /* Expecta.xcodeproj */;
},
{
- ProductGroup = 909B48B017C2EB4300CE8C5E /* Products */;
- ProjectRef = 909B48AF17C2EB4300CE8C5E /* Specta.xcodeproj */;
+ ProductGroup = 90425488187103F40066DA41 /* Products */;
+ ProjectRef = 90425487187103F40066DA41 /* Specta.xcodeproj */;
},
);
projectRoot = "";
@@ -960,67 +945,67 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 909B48C117C2EB4400CE8C5E /* libSpecta-iOS.a */ = {
+ 9042547E187103F00066DA41 /* libExpecta.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = "libSpecta-iOS.a";
- remoteRef = 909B48C017C2EB4400CE8C5E /* PBXContainerItemProxy */;
+ path = libExpecta.a;
+ remoteRef = 9042547D187103F00066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 90B281CF186316E8004D9550 /* ExpectaTests-XCTest.xctest */ = {
+ 90425480187103F00066DA41 /* libExpecta-iOS.a */ = {
isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "ExpectaTests-XCTest.xctest";
- remoteRef = 90B281CE186316E8004D9550 /* PBXContainerItemProxy */;
+ fileType = archive.ar;
+ path = "libExpecta-iOS.a";
+ remoteRef = 9042547F187103F00066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 90B281D5186316E8004D9550 /* libSpecta-OSX.a */ = {
+ 90425482187103F00066DA41 /* ExpectaTests.octest */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libSpecta-OSX.a";
- remoteRef = 90B281D4186316E8004D9550 /* PBXContainerItemProxy */;
+ fileType = wrapper.cfbundle;
+ path = ExpectaTests.octest;
+ remoteRef = 90425481187103F00066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 90B281D7186316E8004D9550 /* SpectaTests-iOS.xctest */ = {
+ 90425484187103F00066DA41 /* Expecta-iOSTests.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
- path = "SpectaTests-iOS.xctest";
- remoteRef = 90B281D6186316E8004D9550 /* PBXContainerItemProxy */;
+ path = "Expecta-iOSTests.octest";
+ remoteRef = 90425483187103F00066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 90B281D9186316E8004D9550 /* Specta-OSXTests.xctest */ = {
+ 90425486187103F00066DA41 /* ExpectaTests-XCTest.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
- path = "Specta-OSXTests.xctest";
- remoteRef = 90B281D8186316E8004D9550 /* PBXContainerItemProxy */;
+ path = "ExpectaTests-XCTest.xctest";
+ remoteRef = 90425485187103F00066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- C7CF9B01174988D0008D9D13 /* libExpecta.a */ = {
+ 9042548F187103F40066DA41 /* libSpecta-iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libExpecta.a;
- remoteRef = C7CF9B00174988D0008D9D13 /* PBXContainerItemProxy */;
+ path = "libSpecta-iOS.a";
+ remoteRef = 9042548E187103F40066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- C7CF9B03174988D0008D9D13 /* libExpecta-iOS.a */ = {
+ 90425491187103F40066DA41 /* libSpecta-OSX.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = "libExpecta-iOS.a";
- remoteRef = C7CF9B02174988D0008D9D13 /* PBXContainerItemProxy */;
+ path = "libSpecta-OSX.a";
+ remoteRef = 90425490187103F40066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- C7CF9B05174988D0008D9D13 /* ExpectaTests.octest */ = {
+ 90425493187103F40066DA41 /* SpectaTests-iOS.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
- path = ExpectaTests.octest;
- remoteRef = C7CF9B04174988D0008D9D13 /* PBXContainerItemProxy */;
+ path = "SpectaTests-iOS.xctest";
+ remoteRef = 90425492187103F40066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- C7CF9B07174988D0008D9D13 /* Expecta-iOSTests.octest */ = {
+ 90425495187103F40066DA41 /* Specta-OSXTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
- path = "Expecta-iOSTests.octest";
- remoteRef = C7CF9B06174988D0008D9D13 /* PBXContainerItemProxy */;
+ path = "Specta-OSXTests.xctest";
+ remoteRef = 90425494187103F40066DA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -1077,7 +1062,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "#!/bin/bash\n\n# This script automatically sets the version and short version string of\n# an Xcode project from the Git repository containing the project.\n#\n# To use this script in Xcode 4, add the contents to a \"Run Script\" build\n# phase for your application target.\n\nset -o errexit\nset -o nounset\n\n# Use the latest tag for short version (You'll have to make sure that all your tags are of the format 0.0.0,\n# this is to satisfy Apple's rule that short version be three integers separated by dots)\nSHORT_VERSION=$(git --git-dir=\"${SRCROOT}/../.git\" --work-tree=\"${SRCROOT}/../\" describe --abbrev=0)\n\n# I'd like to use the Git commit hash for CFBundleVersion.\n# VERSION=$(git --git-dir=\"${PROJECT_DIR}/.git\" --work-tree=\"${PROJECT_DIR}\" rev-parse --short HEAD)\n\n# But Apple wants this value to be a monotonically increasing integer, so\n# instead use the number of commits on the master branch. If you like to\n# play fast and loose with your Git history, this may cause you problems.\n# Thanks to @amrox for pointing out the issue and fix.\nVERSION=$(git --git-dir=\"${SRCROOT}/../.git\" --work-tree=\"${SRCROOT}\" rev-list HEAD | wc -l | xargs)\n\necho \"VERSION: ${VERSION}\"\necho \"SHORT VERSION: ${SHORT_VERSION}\"\n\n# Output header file\nHEADER=\"${SRCROOT}/BuildConfig.h\"\ncd \"${SRCROOT}/../\"\necho \"// Do not edit\" > \"${HEADER}\"\necho \"#define MAGICAL_RECORD_DISPLAY_VERSION @\\\"${SHORT_VERSION}\\\"\" >> \"${HEADER}\"\necho \"#define MAGICAL_RECORD_VERSION ${VERSION}\" >> \"${HEADER}\"\necho \"// Updated on \"`date` >> \"${HEADER}\"\n";
+ shellScript = "#!/bin/bash\n\n# This script automatically sets the version and short version string of\n# an Xcode project from the Git repository containing the project.\n#\n# To use this script in Xcode 4, add the contents to a \"Run Script\" build\n# phase for your application target.\n\nset -o errexit\nset -o nounset\n\n# Use the latest tag for short version (You'll have to make sure that all your tags are of the format 0.0.0,\n# this is to satisfy Apple's rule that short version be three integers separated by dots)\nSHORT_VERSION=$(git --git-dir=\"${SRCROOT}/.git\" --work-tree=\"${SRCROOT}\" describe --abbrev=0 | xargs)\n\n# I'd like to use the Git commit hash for CFBundleVersion.\nBUILD=$(git --git-dir=\"${PROJECT_DIR}/.git\" --work-tree=\"${PROJECT_DIR}\" rev-parse --short HEAD | xargs)\n\n# But Apple wants this value to be a monotonically increasing integer, so\n# instead use the number of commits on the master branch. If you like to\n# play fast and loose with your Git history, this may cause you problems.\n# Thanks to @amrox for pointing out the issue and fix.\nVERSION=$(git --git-dir=\"${SRCROOT}/.git\" --work-tree=\"${SRCROOT}\" rev-list HEAD | wc -l | xargs)\n\n# For non-master branch builds, tag the display version with the branch name\nBRANCH_NAME=$(git --git-dir=\"${SRCROOT}/.git\" --work-tree=\"${SRCROOT}\" symbolic-ref --short HEAD | xargs)\n\necho \"VERSION: ${VERSION}\"\necho \"SHORT VERSION: ${SHORT_VERSION}\"\necho \"BUILD: ${BUILD}\"\n\n# Output header file\nHEADER=\"${SRCROOT}/MagicalRecord/MagicalRecordVersion.h\"\ncd \"${SRCROOT}\"\necho \"// Do not edit\" > \"${HEADER}\"\necho \"#define MAGICAL_RECORD_DISPLAY_VERSION @\\\"${SHORT_VERSION}${BRANCH_NAME#master}\\\"\" >> \"${HEADER}\"\necho \"#define MAGICAL_RECORD_VERSION ${VERSION}\" >> \"${HEADER}\"\necho \"#define MAGICAL_RECORD_BUILD @\\\"${BUILD}\\\"\" >> \"${HEADER}\"\necho \"// Updated on \"`date` >> \"${HEADER}\"\n";
};
908FFE1B186FB3DF0073F316 /* Update Version Information */ = {
isa = PBXShellScriptBuildPhase;
@@ -1091,7 +1076,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "#!/bin/bash\n\n# This script automatically sets the version and short version string of\n# an Xcode project from the Git repository containing the project.\n#\n# To use this script in Xcode 4, add the contents to a \"Run Script\" build\n# phase for your application target.\n\nset -o errexit\nset -o nounset\n\n# Use the latest tag for short version (You'll have to make sure that all your tags are of the format 0.0.0,\n# this is to satisfy Apple's rule that short version be three integers separated by dots)\nSHORT_VERSION=$(git --git-dir=\"${SRCROOT}/../.git\" --work-tree=\"${SRCROOT}/../\" describe --abbrev=0)\n\n# I'd like to use the Git commit hash for CFBundleVersion.\n# VERSION=$(git --git-dir=\"${PROJECT_DIR}/.git\" --work-tree=\"${PROJECT_DIR}\" rev-parse --short HEAD)\n\n# But Apple wants this value to be a monotonically increasing integer, so\n# instead use the number of commits on the master branch. If you like to\n# play fast and loose with your Git history, this may cause you problems.\n# Thanks to @amrox for pointing out the issue and fix.\nVERSION=$(git --git-dir=\"${SRCROOT}/../.git\" --work-tree=\"${SRCROOT}\" rev-list HEAD | wc -l | xargs)\n\necho \"VERSION: ${VERSION}\"\necho \"SHORT VERSION: ${SHORT_VERSION}\"\n\n# Output header file\nHEADER=\"${SRCROOT}/BuildConfig.h\"\ncd \"${SRCROOT}/../\"\necho \"// Do not edit\" > \"${HEADER}\"\necho \"#define MAGICAL_RECORD_DISPLAY_VERSION @\\\"${SHORT_VERSION}\\\"\" >> \"${HEADER}\"\necho \"#define MAGICAL_RECORD_VERSION ${VERSION}\" >> \"${HEADER}\"\necho \"// Updated on \"`date` >> \"${HEADER}\"\n";
+ shellScript = "#!/bin/bash\n\n# This script automatically sets the version and short version string of\n# an Xcode project from the Git repository containing the project.\n#\n# To use this script in Xcode 4, add the contents to a \"Run Script\" build\n# phase for your application target.\n\nset -o errexit\nset -o nounset\n\n# Use the latest tag for short version (You'll have to make sure that all your tags are of the format 0.0.0,\n# this is to satisfy Apple's rule that short version be three integers separated by dots)\nSHORT_VERSION=$(git --git-dir=\"${SRCROOT}/.git\" --work-tree=\"${SRCROOT}\" describe --abbrev=0 | xargs)\n\n# I'd like to use the Git commit hash for CFBundleVersion.\nBUILD=$(git --git-dir=\"${PROJECT_DIR}/.git\" --work-tree=\"${PROJECT_DIR}\" rev-parse --short HEAD | xargs)\n\n# But Apple wants this value to be a monotonically increasing integer, so\n# instead use the number of commits on the master branch. If you like to\n# play fast and loose with your Git history, this may cause you problems.\n# Thanks to @amrox for pointing out the issue and fix.\nVERSION=$(git --git-dir=\"${SRCROOT}/.git\" --work-tree=\"${SRCROOT}\" rev-list HEAD | wc -l | xargs)\n\n# For non-master branch builds, tag the display version with the branch name\nBRANCH_NAME=$(git --git-dir=\"${SRCROOT}/.git\" --work-tree=\"${SRCROOT}\" symbolic-ref --short HEAD | xargs)\n\necho \"VERSION: ${VERSION}\"\necho \"SHORT VERSION: ${SHORT_VERSION}\"\necho \"BUILD: ${BUILD}\"\n\n# Output header file\nHEADER=\"${SRCROOT}/MagicalRecord/MagicalRecordVersion.h\"\ncd \"${SRCROOT}\"\necho \"// Do not edit\" > \"${HEADER}\"\necho \"#define MAGICAL_RECORD_DISPLAY_VERSION @\\\"${SHORT_VERSION}${BRANCH_NAME#master}\\\"\" >> \"${HEADER}\"\necho \"#define MAGICAL_RECORD_VERSION ${VERSION}\" >> \"${HEADER}\"\necho \"#define MAGICAL_RECORD_BUILD @\\\"${BUILD}\\\"\" >> \"${HEADER}\"\necho \"// Updated on \"`date` >> \"${HEADER}\"\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1343,14 +1328,14 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Library/Support/MagicalRecord-iOS-Prefix.pch";
+ GCC_PREFIX_HEADER = "Support/MagicalRecord-iOS-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
OTHER_LDFLAGS = "-ObjC";
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = "MagicalRecord-iOS";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
@@ -1368,9 +1353,9 @@
"$(SDKROOT)/Developer/Library/Frameworks",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Library/Support/MagicalRecord-iOS-Prefix.pch";
+ GCC_PREFIX_HEADER = "Support/MagicalRecord-iOS-Prefix.pch";
OTHER_LDFLAGS = "-ObjC";
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = "MagicalRecord-iOS";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
VALIDATE_PRODUCT = YES;
@@ -1387,7 +1372,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Library/Support/MagicalRecord-OSX-Prefix.pch";
+ GCC_PREFIX_HEADER = "Support/MagicalRecord-OSX-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
@@ -1406,7 +1391,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Library/Support/MagicalRecord-OSX-Prefix.pch";
+ GCC_PREFIX_HEADER = "Support/MagicalRecord-OSX-Prefix.pch";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
@@ -1435,8 +1420,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(BUILT_PRODUCTS_DIR)",
- "\"$(SRCROOT)/Tests/Support/Vendor/Expecta/src\"/**",
- "\"$(SRCROOT)/Tests/Support/Vendor/Specta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Expecta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Specta/src\"/**",
);
INFOPLIST_FILE = "Tests/Support/MagicalRecordTests-iOS-Info.plist";
MOMC_NO_INVERSE_RELATIONSHIP_WARNINGS = YES;
@@ -1466,8 +1451,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(BUILT_PRODUCTS_DIR)",
- "\"$(SRCROOT)/Tests/Support/Vendor/Expecta/src\"/**",
- "\"$(SRCROOT)/Tests/Support/Vendor/Specta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Expecta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Specta/src\"/**",
);
INFOPLIST_FILE = "Tests/Support/MagicalRecordTests-iOS-Info.plist";
MOMC_NO_INVERSE_RELATIONSHIP_WARNINGS = YES;
@@ -1504,8 +1489,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(BUILT_PRODUCTS_DIR)",
- "\"$(SRCROOT)/Tests/Support/Vendor/Expecta/src\"/**",
- "\"$(SRCROOT)/Tests/Support/Vendor/Specta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Expecta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Specta/src\"/**",
);
INFOPLIST_FILE = "Tests/Support/MagicalRecordTests-OSX-Info.plist";
MOMC_NO_INVERSE_RELATIONSHIP_WARNINGS = YES;
@@ -1534,8 +1519,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(BUILT_PRODUCTS_DIR)",
- "\"$(SRCROOT)/Tests/Support/Vendor/Expecta/src\"/**",
- "\"$(SRCROOT)/Tests/Support/Vendor/Specta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Expecta/src\"/**",
+ "\"$(SRCROOT)/Tests/Vendor/Specta/src\"/**",
);
INFOPLIST_FILE = "Tests/Support/MagicalRecordTests-OSX-Info.plist";
MOMC_NO_INVERSE_RELATIONSHIP_WARNINGS = YES;
View
0  ...proj/project.xcworkspace/contents.xcworkspacedata → ...proj/project.xcworkspace/contents.xcworkspacedata
File renamed without changes
View
2  ...reddata/xcschemes/MagicalRecordTests-OSX.xcscheme → ...reddata/xcschemes/MagicalRecordTests-OSX.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0510"
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
View
2  ...reddata/xcschemes/MagicalRecordTests-iOS.xcscheme → ...reddata/xcschemes/MagicalRecordTests-iOS.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0510"
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
View
2  ...hareddata/xcschemes/libMagicalRecord-OSX.xcscheme → ...hareddata/xcschemes/libMagicalRecord-OSX.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0510"
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
View
4 ...hareddata/xcschemes/libMagicalRecord-iOS.xcscheme → ...hareddata/xcschemes/libMagicalRecord-iOS.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0510"
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C7CF97AA17498414008D9D13"
- BuildableName = "liblibMagicalRecord-iOS.a"
+ BuildableName = "libMagicalRecord-iOS.a"
BlueprintName = "libMagicalRecord-iOS"
ReferencedContainer = "container:MagicalRecord.xcodeproj">
</BuildableReference>
View
1  MagicalRecord/Core/MagicalRecord.h
@@ -51,6 +51,7 @@ typedef void (^CoreDataBlock)(NSManagedObjectContext *context);
+ (NSInteger)version;
+ (NSString *)displayVersion;
++ (NSString *)build;
+ (NSString *) currentStack;
View
7 MagicalRecord/Core/MagicalRecord.m
@@ -6,7 +6,7 @@
//
#import "CoreData+MagicalRecord.h"
-#import "BuildConfig.h"
+#import "MagicalRecordVersion.h"
NSString * const kMagicalRecordCleanedUpNotification = @"kMagicalRecordCleanedUpNotification";
@@ -36,6 +36,11 @@ + (NSString *)displayVersion
return MAGICAL_RECORD_DISPLAY_VERSION;
}
++ (NSString *)build
+{
+ return MAGICAL_RECORD_BUILD;
+}
+
+ (void) cleanUp
{
[self cleanUpErrorHanding];
View
3  MagicalRecord/CoreData+MagicalRecord.h
@@ -4,9 +4,6 @@
#endif
#ifdef __OBJC__
-// #if !( __has_feature(objc_arc) && __has_feature(objc_arc_weak) )
-// #error MagicalRecord now requires ARC to be enabled
-// #endif
#import <CoreFoundation/CoreFoundation.h>
#import <CoreData/CoreData.h>
View
5 MagicalRecord/MagicalRecordVersion.h
@@ -0,0 +1,5 @@
+// Do not edit
+#define MAGICAL_RECORD_DISPLAY_VERSION @"2.2develop"
+#define MAGICAL_RECORD_VERSION 595
+#define MAGICAL_RECORD_BUILD @"1a09221"
+// Updated on Wed Jan 1 12:39:31 EST 2014
View
BIN  Project Files/Default-568h@2x.png
Deleted file not rendered
View
60 Project Files/Rakefile
@@ -1,60 +0,0 @@
-@ios_fixtures = "Unit Tests/Fixtures/iOS"
-
-
-@target = ""
-@project = ""
-@fixtures = ""
-
-namespace :setup do
- task :ios do
-
- end
-
- task :osx do
- @target = "Mac App Unit Tests"
- @project = "Magical Record.xcodeproj"
- @fixtures = "Unit Tests/Fixtures/Mac"
- end
-end
-
-namespace :clean do
- task :osx => ["setup:osx"] do
- rm_rf "#{@fixtures}/TestEntities"
- end
-end
-
-namespace :build do
-
- task :run do
- results = system("xcodebuild -project '#{@project}' -target '#{@target}'")
- puts results
- end
-
- namespace :db do
- task :create do
- Dir.chdir(@fixtures) do
- puts `/usr/local/bin/mogenerator -m TestModel.xcdatamodeld/TestModel.xcdatamodel -O TestEntities`
- end
- end
- end
-
- task :osx => ["setup:osx", "clean:osx", "build:db:create", "build:run"]
-
- task :ios => [] do
-
- end
-end
-
-namespace :test do
- task :osx => ["build:osx"] do
- puts "testing osx"
- end
-
- task :ios do
- puts "testing ios"
- end
-end
-
-task :test => ["test:osx", "test:ios"]
-
-task :default => :test
1  Project Files/Tests/Support/Vendor/Expecta
@@ -1 +0,0 @@
-Subproject commit f02b26c85a3d708e7a57c946ced0cfd0d663df00
View
0  ...iles/Library/Support/MagicalRecord-OSX-Prefix.pch → Support/MagicalRecord-OSX-Prefix.pch
File renamed without changes
View
0  ...iles/Library/Support/MagicalRecord-iOS-Prefix.pch → Support/MagicalRecord-iOS-Prefix.pch
File renamed without changes
View
0  Project Files/generateShorthandFile.rb → Support/Scripts/generateShorthandFile.rb
File renamed without changes
View
18 Support/Scripts/objc-build-scripts/LICENSE.md
@@ -0,0 +1,18 @@
+**Copyright (c) 2013 Justin Spahr-Summers**
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
82 Support/Scripts/objc-build-scripts/README.md
@@ -0,0 +1,82 @@
+# objc-build-scripts
+
+This project is a collection of scripts created with two goals:
+
+ 1. To standardize how Objective-C projects are bootstrapped after cloning
+ 1. To easily build Objective-C projects on continuous integration servers
+
+## Scripts
+
+Right now, there are two important scripts: [`bootstrap`](#bootstrap) and
+[`cibuild`](#cibuild). Both are Bash scripts, to maximize compatibility and
+eliminate pesky system configuration issues (like setting up a working Ruby
+environment).
+
+The structure of the scripts on disk is meant to follow that of a typical Ruby
+project:
+
+```
+script/
+ bootstrap
+ cibuild
+```
+
+### bootstrap
+
+This script is responsible for bootstrapping (initializing) your project after
+it's been checked out. Here, you should install or clone any dependencies that
+are required for a working build and development environment.
+
+By default, the script will verify that [xctool][] is installed, then initialize
+and update submodules recursively. If any submodules contain `script/bootstrap`,
+that will be run as well.
+
+To check that other tools are installed, you can set the `REQUIRED_TOOLS`
+environment variable before running `script/bootstrap`, or edit it within the
+script directly. Note that no installation is performed automatically, though
+this can always be added within your specific project.
+
+### cibuild
+
+This script is responsible for building the project, as you would want it built
+for continuous integration. This is preferable to putting the logic on the CI
+server itself, since it ensures that any changes are versioned along with the
+source.
+
+By default, the script will run [`bootstrap`](#bootstrap), look for any Xcode
+workspace or project in the working directory, then build all targets/schemes
+(as found by `xcodebuild -list`) using [xctool][].
+
+You can also specify the schemes to build by passing them into the script:
+
+```sh
+script/cibuild ReactiveCocoa-Mac ReactiveCocoa-iOS
+```
+
+As with the `bootstrap` script, there are several environment variables that can
+be used to customize behavior. They can be set on the command line before
+invoking the script, or the defaults changed within the script directly.
+
+## Getting Started
+
+To add the scripts to your project, read the contents of this repository into
+a `script` folder:
+
+```
+$ git remote add objc-build-scripts https://github.com/jspahrsummers/objc-build-scripts.git
+$ git fetch objc-build-scripts
+$ git read-tree --prefix=script/ -u objc-build-scripts/master
+```
+
+Then commit the changes, to incorporate the scripts into your own repository's
+history. You can also freely tweak the scripts for your specific project's
+needs.
+
+To merge in upstream changes later:
+
+```
+$ git fetch -p objc-build-scripts
+$ git merge --ff --squash -Xsubtree=script objc-build-scripts/master
+```
+
+[xctool]: https://github.com/facebook/xctool
View
80 Support/Scripts/objc-build-scripts/bootstrap
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export SCRIPT_DIR=$(dirname "$0")
+
+##
+## Configuration Variables
+##
+
+config ()
+{
+ # A whitespace-separated list of executables that must be present and locatable.
+ : ${REQUIRED_TOOLS="xctool"}
+
+ export REQUIRED_TOOLS
+}
+
+##
+## Bootstrap Process
+##
+
+main ()
+{
+ config
+
+ if [ -n "$REQUIRED_TOOLS" ]
+ then
+ echo "*** Checking dependencies..."
+ check_deps
+ fi
+
+ local submodules=$(git submodule status)
+ local result=$?
+
+ if [ "$result" -ne "0" ]
+ then
+ exit $result
+ fi
+
+ if [ -n "$submodules" ]
+ then
+ echo "*** Updating submodules..."
+ update_submodules
+ fi
+}
+
+check_deps ()
+{
+ for tool in $REQUIRED_TOOLS
+ do
+ which -s "$tool"
+ if [ "$?" -ne "0" ]
+ then
+ echo "*** Error: $tool not found. Please install it and bootstrap again."
+ exit 1
+ fi
+ done
+}
+
+bootstrap_submodule ()
+{
+ local bootstrap="script/bootstrap"
+
+ if [ -e "$bootstrap" ]
+ then
+ echo "*** Bootstrapping $name..."
+ "$bootstrap" >/dev/null
+ else
+ update_submodules
+ fi
+}
+
+update_submodules ()
+{
+ git submodule sync --quiet && git submodule update --init && git submodule foreach --quiet bootstrap_submodule
+}
+
+export -f bootstrap_submodule
+export -f update_submodules
+
+main
View
142 Support/Scripts/objc-build-scripts/cibuild
@@ -0,0 +1,142 @@
+#!/bin/bash
+
+export SCRIPT_DIR=$(dirname "$0")
+
+##
+## Configuration Variables
+##
+
+SCHEMES="$@"
+
+config ()
+{
+ # The workspace to build.
+ #
+ # If not set and no workspace is found, the -workspace flag will not be passed
+ # to `xctool`.
+ #
+ # Only one of `XCWORKSPACE` and `XCODEPROJ` needs to be set. The former will
+ # take precedence.
+ : ${XCWORKSPACE=$(find_pattern "*.xcworkspace")}
+
+ # The project to build.
+ #
+ # If not set and no project is found, the -project flag will not be passed
+ # to `xctool`.
+ #
+ # Only one of `XCWORKSPACE` and `XCODEPROJ` needs to be set. The former will
+ # take precedence.
+ : ${XCODEPROJ=$(find_pattern "*.xcodeproj")}
+
+ # A bootstrap script to run before building.
+ #
+ # If this file does not exist, it is not considered an error.
+ : ${BOOTSTRAP="$SCRIPT_DIR/bootstrap"}
+
+ # Extra options to pass to xctool.
+ : ${XCTOOL_OPTIONS="RUN_CLANG_STATIC_ANALYZER=NO"}
+
+ # A whitespace-separated list of default schemes to build.
+ #
+ # Individual names can be quoted to avoid word splitting.
+ : ${SCHEMES:=$(xcodebuild -list -project "$XCODEPROJ" 2>/dev/null | awk -f "$SCRIPT_DIR/schemes.awk")}
+
+ export XCWORKSPACE
+ export XCODEPROJ
+ export BOOTSTRAP
+ export XCTOOL_OPTIONS
+ export SCHEMES
+}
+
+##
+## Build Process
+##
+
+main ()
+{
+ config
+
+ if [ -f "$BOOTSTRAP" ]
+ then
+ echo "*** Bootstrapping..."
+ "$BOOTSTRAP" || exit $?
+ fi
+
+ echo "*** The following schemes will be built:"
+ echo "$SCHEMES" | xargs -n 1 echo " "
+ echo
+
+ echo "$SCHEMES" | xargs -n 1 | (
+ local status=0
+
+ while read scheme
+ do
+ build_scheme "$scheme" || status=1
+ done
+
+ exit $status
+ )
+}
+
+find_pattern ()
+{
+ ls -d $1 2>/dev/null | head -n 1
+}
+
+run_xctool ()
+{
+ if [ -n "$XCWORKSPACE" ]
+ then
+ xctool -workspace "$XCWORKSPACE" $XCTOOL_OPTIONS "$@" 2>&1
+ elif [ -n "$XCODEPROJ" ]
+ then
+ xctool -project "$XCODEPROJ" $XCTOOL_OPTIONS "$@" 2>&1
+ else
+ echo "*** No workspace or project file found."
+ exit 1
+ fi
+}
+
+parse_build ()
+{
+ awk -f "$SCRIPT_DIR/xctool.awk" 2>&1 >/dev/null
+}
+
+build_scheme ()
+{
+ local scheme=$1
+
+ echo "*** Cleaning $scheme..."
+ run_xctool -scheme "$scheme" clean >/dev/null || exit $?
+
+ echo "*** Building and testing $scheme..."
+ echo
+
+ local sdkflag=
+ local action=test
+
+ # Determine whether we can run unit tests for this target.
+ run_xctool -scheme "$scheme" run-tests | parse_build
+
+ local awkstatus=$?
+
+ if [ "$awkstatus" -ne "0" ]
+ then
+ # Unit tests aren't supported.
+ action=build
+ fi
+
+ if [ "$awkstatus" -eq "1" ]
+ then
+ # Build for iOS.
+ sdkflag="-sdk iphonesimulator"
+ fi
+
+ run_xctool $sdkflag -scheme "$scheme" $action
+}
+
+export -f build_scheme
+export -f run_xctool
+export -f parse_build
+
+main
View
12 Support/Scripts/objc-build-scripts/schemes.awk
@@ -0,0 +1,12 @@
+BEGIN {
+ FS = "\n";
+}
+
+/Targets:/ {
+ while (getline && $0 != "") {
+ if ($0 ~ /Test/) continue;
+
+ sub(/^ +/, "");
+ print "'" $0 "'";
+ }
+}
View
12 Support/Scripts/objc-build-scripts/targets.awk
@@ -0,0 +1,12 @@
+BEGIN {
+ FS = "\n";
+}
+
+/Targets:/ {
+ while (getline && $0 != "") {
+ if ($0 ~ /Tests/) continue;
+
+ sub(/^ +/, "");
+ print "'" $0 "'";
+ }
+}
View
35 Support/Scripts/objc-build-scripts/xcodebuild.awk
@@ -0,0 +1,35 @@
+# Exit statuses:
+#
+# 0 - No errors found.
+# 1 - Build or test failure. Errors will be logged automatically.
+# 2 - Untestable target. Retry with the "build" action.
+
+BEGIN {
+ status = 0;
+}
+
+{
+ print;
+ fflush(stdout);
+}
+
+/is not valid for Testing/ {
+ exit 2;
+}
+
+/[0-9]+: (error|warning):/ {
+ errors = errors $0 "\n";
+}
+
+/(TEST|BUILD) FAILED/ {
+ status = 1;
+}
+
+END {
+ if (length(errors) > 0) {
+ print "\n*** All errors:\n" errors;
+ }
+
+ fflush(stdout);
+ exit status;
+}
View
25 Support/Scripts/objc-build-scripts/xctool.awk
@@ -0,0 +1,25 @@
+# Exit statuses:
+#
+# 0 - No errors found.
+# 1 - Wrong SDK. Retry with SDK `iphonesimulator`.
+# 2 - Missing target.
+
+BEGIN {
+ status = 0;
+}
+
+{
+ print;
+}
+
+/Testing with the '(.+)' SDK is not yet supported/ {
+ status = 1;
+}
+
+/does not contain a target named/ {
+ status = 2;
+}
+
+END {
+ exit status;
+}
View
0  Project Files/Tests/Core/MagicalRecordStackTests.m → Tests/Core/MagicalRecordStackTests.m
File renamed without changes
View
0  Project Files/Tests/Core/MagicalRecordTestBase.h → Tests/Core/MagicalRecordTestBase.h
File renamed without changes
View
0  Project Files/Tests/Core/MagicalRecordTestBase.m → Tests/Core/MagicalRecordTestBase.m
File renamed without changes
View
0  ...es/Tests/Core/NSManagedObjectContextHelperTests.m → Tests/Core/NSManagedObjectContextHelperTests.m
File renamed without changes
View
0  ...ect Files/Tests/Core/NSManagedObjectHelperTests.m → Tests/Core/NSManagedObjectHelperTests.m
File renamed without changes
View
0  ...ct Files/Tests/Core/NSPersisentStoreHelperTests.m → Tests/Core/NSPersisentStoreHelperTests.m
File renamed without changes
View
0  ...ts/Core/NSPersistentStoreCoordinatorHelperTests.m → Tests/Core/NSPersistentStoreCoordinatorHelperTests.m
File renamed without changes
View
0  ...dToManyMappedEntitiesUsingMappedPrimaryKeyTests.m → ...dToManyMappedEntitiesUsingMappedPrimaryKeyTests.m
File renamed without changes
View
0  ...leEntityRelatedToMappedEntityUsingDefaultsTests.m → ...leEntityRelatedToMappedEntityUsingDefaultsTests.m
File renamed without changes
View
0  ...RelatedToMappedEntityUsingMappedPrimaryKeyTests.m → ...RelatedToMappedEntityUsingMappedPrimaryKeyTests.m
File renamed without changes
View
0  ...edToMappedEntityWithNestedMappedAttributesTests.m → ...edToMappedEntityWithNestedMappedAttributesTests.m
File renamed without changes
View
0  ...RelatedToMappedEntityWithSecondaryMappingsTests.m → ...RelatedToMappedEntityWithSecondaryMappingsTests.m
File renamed without changes
View
0  ...port/ImportSingleEntityWithNoRelationshipsTests.m → ...port/ImportSingleEntityWithNoRelationshipsTests.m
File renamed without changes
View
0  ...Tests/DataImport/ImportSingleRelatedEntityTests.m → Tests/DataImport/ImportSingleRelatedEntityTests.m
File renamed without changes
View
0  ...iles/Tests/DataImport/MagicalDataImportTestCase.h → Tests/DataImport/MagicalDataImportTestCase.h
File renamed without changes
View
0  ...iles/Tests/DataImport/MagicalDataImportTestCase.m → Tests/DataImport/MagicalDataImportTestCase.m
File renamed without changes
View
0  Project Files/Tests/Fixtures/FixtureHelpers.h → Tests/Fixtures/FixtureHelpers.h
File renamed without changes
View
0  Project Files/Tests/Fixtures/FixtureHelpers.m → Tests/Fixtures/FixtureHelpers.m
File renamed without changes
View
0  ...ToManyMappedEntitiesUsingListOfPrimaryKeysTests.m → ...ToManyMappedEntitiesUsingListOfPrimaryKeysTests.m
File renamed without changes
View
0  ...Files/Tests/Fixtures/SampleJSONDataForImport.json → Tests/Fixtures/SampleJSONDataForImport.json
File renamed without changes
View
0  ...edToManyMappedEntitiesUsingListOfPrimaryKeys.json → ...edToManyMappedEntitiesUsingListOfPrimaryKeys.json
File renamed without changes
View
0  ...tedToManyMappedEntitiesUsingMappedPrimaryKey.json → ...tedToManyMappedEntitiesUsingMappedPrimaryKey.json
File renamed without changes
View
0  ...ngleEntityRelatedToMappedEntityUsingDefaults.json → ...ngleEntityRelatedToMappedEntityUsingDefaults.json
File renamed without changes
View
0  ...tyRelatedToMappedEntityUsingMappedPrimaryKey.json → ...tyRelatedToMappedEntityUsingMappedPrimaryKey.json
File renamed without changes
View
0  ...atedToMappedEntityWithNestedMappedAttributes.json → ...atedToMappedEntityWithNestedMappedAttributes.json
File renamed without changes
View
0  ...tyRelatedToMappedEntityWithSecondaryMappings.json → ...tyRelatedToMappedEntityWithSecondaryMappings.json
File renamed without changes
View
0  ...sts/Fixtures/SingleEntityWithNoRelationships.json → Tests/Fixtures/SingleEntityWithNoRelationships.json
File renamed without changes
View
0  ...ts/Fixtures/SingleEntityWithNoRelationships.plist → Tests/Fixtures/SingleEntityWithNoRelationships.plist
File renamed without changes
View
0  ...ect Files/Tests/Fixtures/SingleRelatedEntity.json → Tests/Fixtures/SingleRelatedEntity.json
File renamed without changes
View
0  ...Model.xcdatamodeld/TestModel.xcdatamodel/contents → ...Model.xcdatamodeld/TestModel.xcdatamodel/contents
File renamed without changes
View
0  .../Tests/Fixtures/TestModel/AbstractRelatedEntity.h → Tests/Fixtures/TestModel/AbstractRelatedEntity.h
File renamed without changes
View
0  .../Tests/Fixtures/TestModel/AbstractRelatedEntity.m → Tests/Fixtures/TestModel/AbstractRelatedEntity.m
File renamed without changes
View
0  .../Tests/Fixtures/TestModel/ConcreteRelatedEntity.h → Tests/Fixtures/TestModel/ConcreteRelatedEntity.h
File renamed without changes
View
0  .../Tests/Fixtures/TestModel/ConcreteRelatedEntity.m → Tests/Fixtures/TestModel/ConcreteRelatedEntity.m
File renamed without changes
View
0  ...ts/Fixtures/TestModel/DifferentClassNameMapping.h → Tests/Fixtures/TestModel/DifferentClassNameMapping.h
File renamed without changes
View
0  ...ts/Fixtures/TestModel/DifferentClassNameMapping.m → Tests/Fixtures/TestModel/DifferentClassNameMapping.m
File renamed without changes
View
0  ...ect Files/Tests/Fixtures/TestModel/MappedEntity.h → Tests/Fixtures/TestModel/MappedEntity.h
File renamed without changes
View
0  ...ect Files/Tests/Fixtures/TestModel/MappedEntity.m → Tests/Fixtures/TestModel/MappedEntity.m
File renamed without changes
View
0  ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.h → ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.h
File renamed without changes
View
0  ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.m → ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.m
File renamed without changes
View
0  .../SingleEntityRelatedToMappedEntityUsingDefaults.h → .../SingleEntityRelatedToMappedEntityUsingDefaults.h
File renamed without changes
View
0  .../SingleEntityRelatedToMappedEntityUsingDefaults.m → .../SingleEntityRelatedToMappedEntityUsingDefaults.m
File renamed without changes
View
0  ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.h → ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.h
File renamed without changes
View
0  ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.m → ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.m
File renamed without changes
View
0  ...RelatedToMappedEntityWithNestedMappedAttributes.h → ...RelatedToMappedEntityWithNestedMappedAttributes.h
File renamed without changes
View
0  ...RelatedToMappedEntityWithNestedMappedAttributes.m → ...RelatedToMappedEntityWithNestedMappedAttributes.m
File renamed without changes
View
0  ...ntityRelatedToMappedEntityWithSecondaryMappings.h → ...ntityRelatedToMappedEntityWithSecondaryMappings.h
File renamed without changes
View
0  ...ntityRelatedToMappedEntityWithSecondaryMappings.m → ...ntityRelatedToMappedEntityWithSecondaryMappings.m
File renamed without changes
View
0  ...tures/TestModel/SingleEntityWithNoRelationships.h → ...tures/TestModel/SingleEntityWithNoRelationships.h
File renamed without changes
View
0  ...tures/TestModel/SingleEntityWithNoRelationships.m → ...tures/TestModel/SingleEntityWithNoRelationships.m
File renamed without changes
View
0  ...es/Tests/Fixtures/TestModel/SingleRelatedEntity.h → Tests/Fixtures/TestModel/SingleRelatedEntity.h
File renamed without changes
View
0  ...es/Tests/Fixtures/TestModel/SingleRelatedEntity.m → Tests/Fixtures/TestModel/SingleRelatedEntity.m
File renamed without changes
View
0  ...Tests/Fixtures/TestModel/_AbstractRelatedEntity.h → Tests/Fixtures/TestModel/_AbstractRelatedEntity.h
File renamed without changes
View
0  ...Tests/Fixtures/TestModel/_AbstractRelatedEntity.m → Tests/Fixtures/TestModel/_AbstractRelatedEntity.m
File renamed without changes
View
0  ...Tests/Fixtures/TestModel/_ConcreteRelatedEntity.h → Tests/Fixtures/TestModel/_ConcreteRelatedEntity.h
File renamed without changes
View
0  ...Tests/Fixtures/TestModel/_ConcreteRelatedEntity.m → Tests/Fixtures/TestModel/_ConcreteRelatedEntity.m
File renamed without changes
View
0  ...s/Fixtures/TestModel/_DifferentClassNameMapping.h → ...s/Fixtures/TestModel/_DifferentClassNameMapping.h
File renamed without changes
View
0  ...s/Fixtures/TestModel/_DifferentClassNameMapping.m → ...s/Fixtures/TestModel/_DifferentClassNameMapping.m
File renamed without changes
View
0  ...ct Files/Tests/Fixtures/TestModel/_MappedEntity.h → Tests/Fixtures/TestModel/_MappedEntity.h
File renamed without changes
View
0  ...ct Files/Tests/Fixtures/TestModel/_MappedEntity.m → Tests/Fixtures/TestModel/_MappedEntity.m
File renamed without changes
View
0  ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.h → ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.h
File renamed without changes
View
0  ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.m → ...elatedToManyMappedEntitiesUsingMappedPrimaryKey.m
File renamed without changes
View
0  ..._SingleEntityRelatedToMappedEntityUsingDefaults.h → ..._SingleEntityRelatedToMappedEntityUsingDefaults.h
File renamed without changes
View
0  ..._SingleEntityRelatedToMappedEntityUsingDefaults.m → ..._SingleEntityRelatedToMappedEntityUsingDefaults.m
File renamed without changes
View
0  ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.h → ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.h
File renamed without changes
View
0  ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.m → ...ntityRelatedToMappedEntityUsingMappedPrimaryKey.m
File renamed without changes
View
0  ...RelatedToMappedEntityWithNestedMappedAttributes.h → ...RelatedToMappedEntityWithNestedMappedAttributes.h
File renamed without changes
View
0  ...RelatedToMappedEntityWithNestedMappedAttributes.m → ...RelatedToMappedEntityWithNestedMappedAttributes.m
File renamed without changes
View
0  ...ntityRelatedToMappedEntityWithSecondaryMappings.h → ...ntityRelatedToMappedEntityWithSecondaryMappings.h
File renamed without changes
View
0  ...ntityRelatedToMappedEntityWithSecondaryMappings.m → ...ntityRelatedToMappedEntityWithSecondaryMappings.m
File renamed without changes
View
0  ...ures/TestModel/_SingleEntityWithNoRelationships.h → ...ures/TestModel/_SingleEntityWithNoRelationships.h
File renamed without changes
View
0  ...ures/TestModel/_SingleEntityWithNoRelationships.m → ...ures/TestModel/_SingleEntityWithNoRelationships.m
File renamed without changes
View
0  ...s/Tests/Fixtures/TestModel/_SingleRelatedEntity.h → Tests/Fixtures/TestModel/_SingleRelatedEntity.h
File renamed without changes
View
0  ...s/Tests/Fixtures/TestModel/_SingleRelatedEntity.m → Tests/Fixtures/TestModel/_SingleRelatedEntity.m
File renamed without changes
View
0  Project Files/Tests/MagicalRecord+ActionsSpec.m → Tests/MagicalRecord+ActionsSpec.m
File renamed without changes
View
0  ...s/Tests/NSManagedObjectContext+MagicalSavesSpec.m → Tests/NSManagedObjectContext+MagicalSavesSpec.m
File renamed without changes
View
0  ...s/Tests/Support/MagicalRecordTests-OSX-Info.plist → Tests/Support/MagicalRecordTests-OSX-Info.plist
File renamed without changes
View
0  ...s/Tests/Support/MagicalRecordTests-OSX-Prefix.pch → Tests/Support/MagicalRecordTests-OSX-Prefix.pch
File renamed without changes
View
0  ...s/Tests/Support/MagicalRecordTests-iOS-Info.plist → Tests/Support/MagicalRecordTests-iOS-Info.plist
File renamed without changes
View
0  ...s/Tests/Support/MagicalRecordTests-iOS-Prefix.pch → Tests/Support/MagicalRecordTests-iOS-Prefix.pch
File renamed without changes
1  Tests/Vendor/Expecta
@@ -0,0 +1 @@
+Subproject commit c4bac22b7dfb558147eba6b6f0730ce5ecfd5d10
View
0  Project Files/Tests/Support/Vendor/Specta → Tests/Vendor/Specta
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.