From b52e4d17386a66711864d81a7f4eacac3c2adc72 Mon Sep 17 00:00:00 2001 From: Denys Telezhkin Date: Thu, 30 Jun 2016 22:57:46 +0300 Subject: [PATCH] use angular brackets in umbrella header for EasyMapping to avoid Include of non-modular header inside framework warning. --- EasyMapping/EasyMapping.h | 23 ++- .../AppIcon.appiconset/Contents.json | 20 ++ .../project.pbxproj | 192 +++++++++--------- EasyMappingExample/Podfile.lock | 4 +- 4 files changed, 131 insertions(+), 108 deletions(-) diff --git a/EasyMapping/EasyMapping.h b/EasyMapping/EasyMapping.h index ae81884..88af014 100644 --- a/EasyMapping/EasyMapping.h +++ b/EasyMapping/EasyMapping.h @@ -21,14 +21,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "EKMapper.h" -#import "EKSerializer.h" -#import "EKObjectMapping.h" -#import "EKManagedObjectMapper.h" -#import "EKManagedObjectMapping.h" -#import "EKMappingBlocks.h" -#import "EKObjectModel.h" -#import "EKManagedObjectModel.h" -#import "EKMappingProtocol.h" -#import "EKPropertyMapping.h" -#import "NSDateFormatter+EasyMappingAdditions.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import diff --git a/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/Images.xcassets/AppIcon.appiconset/Contents.json b/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/Images.xcassets/AppIcon.appiconset/Contents.json index 91bf9c1..eeea76c 100644 --- a/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/Images.xcassets/AppIcon.appiconset/Contents.json @@ -5,16 +5,31 @@ "size" : "29x29", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "60x60", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, { "idiom" : "ipad", "size" : "29x29", @@ -44,6 +59,11 @@ "idiom" : "ipad", "size" : "76x76", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { diff --git a/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj b/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj index 46d8321..be03a52 100644 --- a/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj +++ b/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj @@ -8,15 +8,16 @@ /* Begin PBXBuildFile section */ 097A5C5C1A67126900CB6CE3 /* EKMappingTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 097A5C5B1A67126900CB6CE3 /* EKMappingTestCase.m */; }; + 32A4080E2C0280CE20CE621A /* libPods-iOS Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF026E637C7C22CE0685D858 /* libPods-iOS Tests.a */; }; 49498DD31A4C41F900158E19 /* PersonWithOtherPhones.json in Resources */ = {isa = PBXBuildFile; fileRef = 49498DD21A4C41F900158E19 /* PersonWithOtherPhones.json */; }; 49498DD51A4C492300158E19 /* PersonWithZeroPhones.json in Resources */ = {isa = PBXBuildFile; fileRef = 49498DD41A4C492300158E19 /* PersonWithZeroPhones.json */; }; 4D612CB61C85DB8C00A167ED /* PersonWithoutRelations.json in Resources */ = {isa = PBXBuildFile; fileRef = 4D612CB51C85DB8C00A167ED /* PersonWithoutRelations.json */; }; - 56C7AF349C6076663D250AC4 /* libPods-MacOS Benchmark.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB37945259736BCB28FC3749 /* libPods-MacOS Benchmark.a */; }; - 64765DB6A240E9DEA0F077A7 /* libPods-iOS Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 453D7873518C068C7DC6BA9A /* libPods-iOS Tests.a */; }; + 5B3795E9001CAF01A9B8F47A /* libPods-MacOS Benchmark.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 89C79000F535174B34255356 /* libPods-MacOS Benchmark.a */; }; 85D1B77A1B21973C00B0555C /* CarsWithNullItem.json in Resources */ = {isa = PBXBuildFile; fileRef = 85D1B7791B21973500B0555C /* CarsWithNullItem.json */; }; 85D1B77B1B21973C00B0555C /* CarsWithNullItem.json in Resources */ = {isa = PBXBuildFile; fileRef = 85D1B7791B21973500B0555C /* CarsWithNullItem.json */; }; 85D1B77C1B21973D00B0555C /* CarsWithNullItem.json in Resources */ = {isa = PBXBuildFile; fileRef = 85D1B7791B21973500B0555C /* CarsWithNullItem.json */; }; 85D1B77D1B21973D00B0555C /* CarsWithNullItem.json in Resources */ = {isa = PBXBuildFile; fileRef = 85D1B7791B21973500B0555C /* CarsWithNullItem.json */; }; + 958448F26B1E20D64DF3AEF0 /* libPods-iOS Benchmark.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB1814673A67105D3B8529ED /* libPods-iOS Benchmark.a */; }; 9A13023D190BFBCA0060A25C /* EasyMappingExample.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9AE54FE5190BD9B5003A3B56 /* EasyMappingExample.xcdatamodeld */; }; 9A130245190BFEF30060A25C /* EKPropertyMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D16CF816F2B2770003759B /* EKPropertyMapping.m */; }; 9A130246190BFEF30060A25C /* EKMapper.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D16CFA16F2B2770003759B /* EKMapper.m */; }; @@ -365,23 +366,21 @@ 9AFC96A61A6BF850008A295D /* XCTestCase+EasyMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AFC96A51A6BF850008A295D /* XCTestCase+EasyMapping.m */; }; 9AFC96A71A6BF850008A295D /* XCTestCase+EasyMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AFC96A51A6BF850008A295D /* XCTestCase+EasyMapping.m */; }; 9EC0BF2D1AB35A1D00F584DF /* CarWithAttributesRemoved.json in Resources */ = {isa = PBXBuildFile; fileRef = 9EC0BF2C1AB35A1D00F584DF /* CarWithAttributesRemoved.json */; }; - 9ECB33F4C744E460A4A3BB1A /* libPods-OS X Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B9EE7166096AAFDB3C116EB /* libPods-OS X Tests.a */; }; - F24FD1A73909722F85B21EAD /* libPods-iOS Benchmark.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39481CD4596FB3F87A51B644 /* libPods-iOS Benchmark.a */; }; + F79F6448431CD9313F5B4188 /* libPods-OS X Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C1204C6DDDE2590C821BB83 /* libPods-OS X Tests.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 02455A6E03E646B792D1C42A /* Pods-MacOS Benchmark.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MacOS Benchmark.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark.debug.xcconfig"; sourceTree = ""; }; + 00F9F4D2A62A2DF714EA8B83 /* Pods-MacOS Benchmark.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MacOS Benchmark.release.xcconfig"; path = "Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark.release.xcconfig"; sourceTree = ""; }; 02FF772618E32249002282D3 /* iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 097A5C5B1A67126900CB6CE3 /* EKMappingTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EKMappingTestCase.m; sourceTree = ""; }; - 0C98BC00258A3303C9C8A68B /* Pods-MacOS Benchmark.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MacOS Benchmark.release.xcconfig"; path = "Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark.release.xcconfig"; sourceTree = ""; }; - 39481CD4596FB3F87A51B644 /* libPods-iOS Benchmark.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOS Benchmark.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 453D7873518C068C7DC6BA9A /* libPods-iOS Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOS Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D580CD9DCC1824E038EDBF1 /* Pods-iOS Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests.debug.xcconfig"; sourceTree = ""; }; + 436C49669F981A3865F82854 /* Pods-iOS Benchmark.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Benchmark.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark.debug.xcconfig"; sourceTree = ""; }; 49498DD21A4C41F900158E19 /* PersonWithOtherPhones.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = PersonWithOtherPhones.json; path = Tests/Fixtures/PersonWithOtherPhones.json; sourceTree = SOURCE_ROOT; }; 49498DD41A4C492300158E19 /* PersonWithZeroPhones.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = PersonWithZeroPhones.json; path = Tests/Fixtures/PersonWithZeroPhones.json; sourceTree = SOURCE_ROOT; }; 4D612CB51C85DB8C00A167ED /* PersonWithoutRelations.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = PersonWithoutRelations.json; path = Tests/Fixtures/PersonWithoutRelations.json; sourceTree = SOURCE_ROOT; }; - 7A583B889DBB57062C718CB9 /* Pods-iOS Benchmark.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Benchmark.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark.debug.xcconfig"; sourceTree = ""; }; + 5C1204C6DDDE2590C821BB83 /* libPods-OS X Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OS X Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 85D1B7791B21973500B0555C /* CarsWithNullItem.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = CarsWithNullItem.json; path = Tests/Fixtures/CarsWithNullItem.json; sourceTree = SOURCE_ROOT; }; - 8CEE779F84323229896E4AE0 /* Pods-OS X Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests.debug.xcconfig"; sourceTree = ""; }; + 89C79000F535174B34255356 /* libPods-MacOS Benchmark.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MacOS Benchmark.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 9A130226190BF9380060A25C /* OS X Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OS X Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 9A170330194C820200682F00 /* EKRelationshipMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EKRelationshipMapping.h; sourceTree = ""; }; 9A170331194C820200682F00 /* EKRelationshipMapping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EKRelationshipMapping.m; sourceTree = ""; }; @@ -520,7 +519,6 @@ 9AE54FE6190BD9B5003A3B56 /* EasyMappingExample.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = EasyMappingExample.xcdatamodel; sourceTree = ""; }; 9AFC96A41A6BF850008A295D /* XCTestCase+EasyMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "XCTestCase+EasyMapping.h"; path = "../XCTest+EasyMapping/XCTestCase+EasyMapping.h"; sourceTree = ""; }; 9AFC96A51A6BF850008A295D /* XCTestCase+EasyMapping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "XCTestCase+EasyMapping.m"; path = "../XCTest+EasyMapping/XCTestCase+EasyMapping.m"; sourceTree = ""; }; - 9B9EE7166096AAFDB3C116EB /* libPods-OS X Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OS X Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 9EC0BF2C1AB35A1D00F584DF /* CarWithAttributesRemoved.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = CarWithAttributesRemoved.json; path = Tests/Fixtures/CarWithAttributesRemoved.json; sourceTree = SOURCE_ROOT; }; A9D16CF616F2B2770003759B /* EasyMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EasyMapping.h; sourceTree = ""; }; A9D16CF716F2B2770003759B /* EKPropertyMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EKPropertyMapping.h; sourceTree = ""; }; @@ -534,11 +532,13 @@ A9D16CFF16F2B2770003759B /* EKPropertyHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EKPropertyHelper.m; sourceTree = ""; }; A9D16D0016F2B2770003759B /* EKSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EKSerializer.h; sourceTree = ""; }; A9D16D0116F2B2770003759B /* EKSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EKSerializer.m; sourceTree = ""; }; - BB37945259736BCB28FC3749 /* libPods-MacOS Benchmark.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MacOS Benchmark.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - D73C9F83BB99B708E83F9976 /* Pods-iOS Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests.debug.xcconfig"; sourceTree = ""; }; - DDCFA545608B5C9A8866952E /* Pods-iOS Benchmark.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Benchmark.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark.release.xcconfig"; sourceTree = ""; }; - F086E47D8B6E3DAB4085A62E /* Pods-iOS Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests.release.xcconfig"; sourceTree = ""; }; - F54B6A037CBF2D6BE8874920 /* Pods-OS X Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests.release.xcconfig"; sourceTree = ""; }; + AF026E637C7C22CE0685D858 /* libPods-iOS Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOS Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + BB1814673A67105D3B8529ED /* libPods-iOS Benchmark.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOS Benchmark.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + CB0DB90EF87B975E080BB5D6 /* Pods-MacOS Benchmark.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MacOS Benchmark.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark.debug.xcconfig"; sourceTree = ""; }; + D2BEE03665E7784DF8BD23BB /* Pods-OS X Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests.debug.xcconfig"; sourceTree = ""; }; + D73E33BB1815569AB283049C /* Pods-OS X Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests.release.xcconfig"; sourceTree = ""; }; + E74832E10E1D5B2DEAE11469 /* Pods-iOS Benchmark.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Benchmark.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark.release.xcconfig"; sourceTree = ""; }; + F1B88B8C69D280B2CEA4F652 /* Pods-iOS Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -546,7 +546,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 64765DB6A240E9DEA0F077A7 /* libPods-iOS Tests.a in Frameworks */, + 32A4080E2C0280CE20CE621A /* libPods-iOS Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -554,7 +554,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9ECB33F4C744E460A4A3BB1A /* libPods-OS X Tests.a in Frameworks */, + F79F6448431CD9313F5B4188 /* libPods-OS X Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -576,7 +576,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F24FD1A73909722F85B21EAD /* libPods-iOS Benchmark.a in Frameworks */, + 958448F26B1E20D64DF3AEF0 /* libPods-iOS Benchmark.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -584,7 +584,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 56C7AF349C6076663D250AC4 /* libPods-MacOS Benchmark.a in Frameworks */, + 5B3795E9001CAF01A9B8F47A /* libPods-MacOS Benchmark.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -654,6 +654,21 @@ path = Tests/XCTests; sourceTree = ""; }; + 126D498BC30057803C999BA5 /* Pods */ = { + isa = PBXGroup; + children = ( + CB0DB90EF87B975E080BB5D6 /* Pods-MacOS Benchmark.debug.xcconfig */, + 00F9F4D2A62A2DF714EA8B83 /* Pods-MacOS Benchmark.release.xcconfig */, + D2BEE03665E7784DF8BD23BB /* Pods-OS X Tests.debug.xcconfig */, + D73E33BB1815569AB283049C /* Pods-OS X Tests.release.xcconfig */, + 436C49669F981A3865F82854 /* Pods-iOS Benchmark.debug.xcconfig */, + E74832E10E1D5B2DEAE11469 /* Pods-iOS Benchmark.release.xcconfig */, + 1D580CD9DCC1824E038EDBF1 /* Pods-iOS Tests.debug.xcconfig */, + F1B88B8C69D280B2CEA4F652 /* Pods-iOS Tests.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; 66C458DA179438FE005AF11E /* Models */ = { isa = PBXGroup; children = ( @@ -972,8 +987,8 @@ 9AF425C2190CEF64003FD1BD /* Supporting files */, 9A4512C219164C20006E6022 /* Benchmarks */, C6557E1316D6621E005D2D3E /* Products */, - CD5110905744E2007BC0C9FB /* Pods */, - D429C6442DF01A0821D30343 /* Frameworks */, + 126D498BC30057803C999BA5 /* Pods */, + FC422F35C3FF475101A004D6 /* Frameworks */, ); sourceTree = ""; }; @@ -1008,28 +1023,13 @@ path = ../EasyMapping; sourceTree = ""; }; - CD5110905744E2007BC0C9FB /* Pods */ = { - isa = PBXGroup; - children = ( - 02455A6E03E646B792D1C42A /* Pods-MacOS Benchmark.debug.xcconfig */, - 0C98BC00258A3303C9C8A68B /* Pods-MacOS Benchmark.release.xcconfig */, - 8CEE779F84323229896E4AE0 /* Pods-OS X Tests.debug.xcconfig */, - F54B6A037CBF2D6BE8874920 /* Pods-OS X Tests.release.xcconfig */, - 7A583B889DBB57062C718CB9 /* Pods-iOS Benchmark.debug.xcconfig */, - DDCFA545608B5C9A8866952E /* Pods-iOS Benchmark.release.xcconfig */, - D73C9F83BB99B708E83F9976 /* Pods-iOS Tests.debug.xcconfig */, - F086E47D8B6E3DAB4085A62E /* Pods-iOS Tests.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; - D429C6442DF01A0821D30343 /* Frameworks */ = { + FC422F35C3FF475101A004D6 /* Frameworks */ = { isa = PBXGroup; children = ( - BB37945259736BCB28FC3749 /* libPods-MacOS Benchmark.a */, - 9B9EE7166096AAFDB3C116EB /* libPods-OS X Tests.a */, - 39481CD4596FB3F87A51B644 /* libPods-iOS Benchmark.a */, - 453D7873518C068C7DC6BA9A /* libPods-iOS Tests.a */, + 89C79000F535174B34255356 /* libPods-MacOS Benchmark.a */, + 5C1204C6DDDE2590C821BB83 /* libPods-OS X Tests.a */, + BB1814673A67105D3B8529ED /* libPods-iOS Benchmark.a */, + AF026E637C7C22CE0685D858 /* libPods-iOS Tests.a */, ); name = Frameworks; sourceTree = ""; @@ -1090,12 +1090,12 @@ isa = PBXNativeTarget; buildConfigurationList = 02FF773518E32249002282D3 /* Build configuration list for PBXNativeTarget "iOS Tests" */; buildPhases = ( - 9C58D0AFBB63C9ADF3A4DE23 /* Check Pods Manifest.lock */, + 5F26013C3D0516DFE546BAD0 /* [CP] Check Pods Manifest.lock */, 02FF772218E32249002282D3 /* Sources */, 02FF772318E32249002282D3 /* Frameworks */, 02FF772418E32249002282D3 /* Resources */, - 1D44820E12E5FC58C070BA44 /* Copy Pods Resources */, - AAC382FE6AF14C3149D4F22A /* Embed Pods Frameworks */, + 22664ED27A5CDC67CA0CDD8B /* [CP] Embed Pods Frameworks */, + 3B77F449A8647E2C0FD3B772 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -1110,12 +1110,12 @@ isa = PBXNativeTarget; buildConfigurationList = 9A130238190BF9380060A25C /* Build configuration list for PBXNativeTarget "OS X Tests" */; buildPhases = ( - A030AAEFEDF1420717F8F1DC /* Check Pods Manifest.lock */, + 4BFF87C018069559A88A55D3 /* [CP] Check Pods Manifest.lock */, 9A130222190BF9380060A25C /* Sources */, 9A130223190BF9380060A25C /* Frameworks */, 9A130224190BF9380060A25C /* Resources */, - 4ECDFDC9F31DA67BDA088F01 /* Copy Pods Resources */, - 4E08BDB297716CD34AB46997 /* Embed Pods Frameworks */, + 93FF53653E8283D8CFF49C76 /* [CP] Embed Pods Frameworks */, + FF234D710D3550F6D29F629F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -1166,12 +1166,12 @@ isa = PBXNativeTarget; buildConfigurationList = 9A451123191643FD006E6022 /* Build configuration list for PBXNativeTarget "iOS Benchmark" */; buildPhases = ( - 6F8A0D50FD97E97B85212B30 /* Check Pods Manifest.lock */, + 0B44AC5464BFDFAB32D6A2B9 /* [CP] Check Pods Manifest.lock */, 9A4510ED191643FD006E6022 /* Sources */, 9A4510EE191643FD006E6022 /* Frameworks */, 9A4510EF191643FD006E6022 /* Resources */, - 2B6504F6D5A54FABE0BF176C /* Copy Pods Resources */, - 2D1EECEF3171D51C28FE14CE /* Embed Pods Frameworks */, + 45AAE6343D5EF23A38E154B6 /* [CP] Embed Pods Frameworks */, + 12ADDF39989FD3B9F10DD7C2 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -1186,12 +1186,12 @@ isa = PBXNativeTarget; buildConfigurationList = 9A45116C1916444C006E6022 /* Build configuration list for PBXNativeTarget "MacOS Benchmark" */; buildPhases = ( - 6E7C0EFDE0C6ED45A3BEF418 /* Check Pods Manifest.lock */, + 7022F2498E092F514CD634C7 /* [CP] Check Pods Manifest.lock */, 9A4511391916444C006E6022 /* Sources */, 9A45113A1916444C006E6022 /* Frameworks */, 9A45113B1916444C006E6022 /* Resources */, - 9136065F3D8ECC7C6EA7ED25 /* Copy Pods Resources */, - 3E25B14567222E99FAE7C81A /* Embed Pods Frameworks */, + 3F2FA95752EA44A1486C83DA /* [CP] Embed Pods Frameworks */, + 0CD8CD0C224141695A2C024A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -1402,119 +1402,119 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1D44820E12E5FC58C070BA44 /* Copy Pods Resources */ = { + 0B44AC5464BFDFAB32D6A2B9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests-resources.sh\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 2B6504F6D5A54FABE0BF176C /* Copy Pods Resources */ = { + 0CD8CD0C224141695A2C024A /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 2D1EECEF3171D51C28FE14CE /* Embed Pods Frameworks */ = { + 12ADDF39989FD3B9F10DD7C2 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 3E25B14567222E99FAE7C81A /* Embed Pods Frameworks */ = { + 22664ED27A5CDC67CA0CDD8B /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 4E08BDB297716CD34AB46997 /* Embed Pods Frameworks */ = { + 3B77F449A8647E2C0FD3B772 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 4ECDFDC9F31DA67BDA088F01 /* Copy Pods Resources */ = { + 3F2FA95752EA44A1486C83DA /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 6E7C0EFDE0C6ED45A3BEF418 /* Check Pods Manifest.lock */ = { + 45AAE6343D5EF23A38E154B6 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Benchmark/Pods-iOS Benchmark-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 6F8A0D50FD97E97B85212B30 /* Check Pods Manifest.lock */ = { + 4BFF87C018069559A88A55D3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -1522,29 +1522,29 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 9136065F3D8ECC7C6EA7ED25 /* Copy Pods Resources */ = { + 5F26013C3D0516DFE546BAD0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MacOS Benchmark/Pods-MacOS Benchmark-resources.sh\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 9C58D0AFBB63C9ADF3A4DE23 /* Check Pods Manifest.lock */ = { + 7022F2498E092F514CD634C7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -1552,34 +1552,34 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - A030AAEFEDF1420717F8F1DC /* Check Pods Manifest.lock */ = { + 93FF53653E8283D8CFF49C76 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - AAC382FE6AF14C3149D4F22A /* Embed Pods Frameworks */ = { + FF234D710D3550F6D29F629F /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Tests/Pods-iOS Tests-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OS X Tests/Pods-OS X Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -1882,7 +1882,7 @@ /* Begin XCBuildConfiguration section */ 02FF773618E32249002282D3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D73C9F83BB99B708E83F9976 /* Pods-iOS Tests.debug.xcconfig */; + baseConfigurationReference = 1D580CD9DCC1824E038EDBF1 /* Pods-iOS Tests.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -1909,7 +1909,7 @@ }; 02FF773718E32249002282D3 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F086E47D8B6E3DAB4085A62E /* Pods-iOS Tests.release.xcconfig */; + baseConfigurationReference = F1B88B8C69D280B2CEA4F652 /* Pods-iOS Tests.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -1933,7 +1933,7 @@ }; 9A130239190BF9380060A25C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8CEE779F84323229896E4AE0 /* Pods-OS X Tests.debug.xcconfig */; + baseConfigurationReference = D2BEE03665E7784DF8BD23BB /* Pods-OS X Tests.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -1961,7 +1961,7 @@ }; 9A13023A190BF9380060A25C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F54B6A037CBF2D6BE8874920 /* Pods-OS X Tests.release.xcconfig */; + baseConfigurationReference = D73E33BB1815569AB283049C /* Pods-OS X Tests.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -2142,7 +2142,7 @@ }; 9A45111F191643FD006E6022 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7A583B889DBB57062C718CB9 /* Pods-iOS Benchmark.debug.xcconfig */; + baseConfigurationReference = 436C49669F981A3865F82854 /* Pods-iOS Benchmark.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -2174,7 +2174,7 @@ }; 9A451120191643FD006E6022 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DDCFA545608B5C9A8866952E /* Pods-iOS Benchmark.release.xcconfig */; + baseConfigurationReference = E74832E10E1D5B2DEAE11469 /* Pods-iOS Benchmark.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -2203,7 +2203,7 @@ }; 9A45116D1916444C006E6022 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 02455A6E03E646B792D1C42A /* Pods-MacOS Benchmark.debug.xcconfig */; + baseConfigurationReference = CB0DB90EF87B975E080BB5D6 /* Pods-MacOS Benchmark.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -2233,7 +2233,7 @@ }; 9A45116E1916444C006E6022 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0C98BC00258A3303C9C8A68B /* Pods-MacOS Benchmark.release.xcconfig */; + baseConfigurationReference = 00F9F4D2A62A2DF714EA8B83 /* Pods-MacOS Benchmark.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/EasyMappingExample/Podfile.lock b/EasyMappingExample/Podfile.lock index 015d64c..a4a9395 100644 --- a/EasyMappingExample/Podfile.lock +++ b/EasyMappingExample/Podfile.lock @@ -24,4 +24,6 @@ SPEC CHECKSUMS: MagicalRecord: 89eb7d7ead39fb37f01c3d010665ee94d17f8dba Mantle: 3fbcca07bdfe76c54a08c241689a60d34d08e783 -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 609028c21eaf9530b08ebfb872f808a9ba3265b0 + +COCOAPODS: 1.0.1