Skip to content

Commit f98ba24

Browse files
MaxRandomMaxRandom
authored
Fix shared mutable template dictionary crash (#13)
* Fix pods * Fix crash on mutating class templates dictionary * Fix review comments * Fix CI
1 parent b8e2bcc commit f98ba24

File tree

5 files changed

+103
-55
lines changed

5 files changed

+103
-55
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
language: objective-c
2-
script: xctool -workspace CRDI.xcworkspace -scheme CRDI build test -sdk iphonesimulator
2+
script: xcodebuild -workspace CRDI.xcworkspace -scheme CRDI test -destination 'platform=iOS Simulator,name=iPhone 5'

‎CRDI.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
4A8DAB7A2B134E5585DBAADE /* libPods-CRDISpecs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 237FFA4A0C19449FB18A9784 /* libPods-CRDISpecs.a */; };
10+
35D6C2A84BBF9D7B50DDAF5C /* libPods-CRDI-CRDISpecs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F83096A83EEE5F6A1A31A231 /* libPods-CRDI-CRDISpecs.a */; };
1111
68ACD69917E75411003BA236 /* CRDiSingletoneBuilderSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 68ACD69817E75411003BA236 /* CRDiSingletoneBuilderSpec.m */; };
1212
68ACD69D17E75956003BA236 /* CRDISingletoneBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 68ACD69C17E75956003BA236 /* CRDISingletoneBuilder.m */; };
1313
68ACD69E17E75956003BA236 /* CRDISingletoneBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 68ACD69C17E75956003BA236 /* CRDISingletoneBuilder.m */; };
14+
697CFAB257A5402569F6B144 /* libPods-CRDI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD3D3D9B9D27FC0B0A3A6E1 /* libPods-CRDI.a */; };
1415
AD1857C317E9C9FE00B0A886 /* CRDIPropertyNameMatcherSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = AD1857C117E9C8D700B0A886 /* CRDIPropertyNameMatcherSpec.m */; };
1516
AD24C80C17E9D8BA00E0ED9E /* CRDIAutoInjector.m in Sources */ = {isa = PBXBuildFile; fileRef = AD24C80B17E9D8BA00E0ED9E /* CRDIAutoInjector.m */; };
1617
AD24C80D17E9D8BA00E0ED9E /* CRDIAutoInjector.m in Sources */ = {isa = PBXBuildFile; fileRef = AD24C80B17E9D8BA00E0ED9E /* CRDIAutoInjector.m */; };
@@ -29,7 +30,6 @@
2930
AD7A72DD17E9C59200602401 /* DIPropertyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = AD7A72D317E9C1E000602401 /* DIPropertyModel.m */; };
3031
AD7A72E217E9C7EA00602401 /* CRDIDefaultPropertyNameMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = AD7A72E117E9C7EA00602401 /* CRDIDefaultPropertyNameMatcher.m */; };
3132
AD7A72E317E9C7EA00602401 /* CRDIDefaultPropertyNameMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = AD7A72E117E9C7EA00602401 /* CRDIDefaultPropertyNameMatcher.m */; };
32-
E25764918F7C42B1801BDC47 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 942E706A687C456799F5BBF6 /* libPods.a */; };
3333
EA06443417E85F9C00CF1132 /* CRDIException.m in Sources */ = {isa = PBXBuildFile; fileRef = EA06443317E85F9C00CF1132 /* CRDIException.m */; };
3434
EA06443517E8610900CF1132 /* CRDIException.m in Sources */ = {isa = PBXBuildFile; fileRef = EA06443317E85F9C00CF1132 /* CRDIException.m */; };
3535
EA0D366217ED9CC30022E216 /* CRDISampeConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = EA0D366017ED9CC10022E216 /* CRDISampeConfiguration.m */; };
@@ -43,7 +43,6 @@
4343
EA5B9E3317E735B2002A0D81 /* CRDIConfigratuion.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5B9E2717E735B2002A0D81 /* CRDIConfigratuion.m */; };
4444
EA5B9E3417E735B2002A0D81 /* CRDIContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5B9E2B17E735B2002A0D81 /* CRDIContainer.m */; };
4545
EA5B9E3517E735B2002A0D81 /* CRDIInjector.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5B9E2E17E735B2002A0D81 /* CRDIInjector.m */; };
46-
EA5B9E3C17E735C1002A0D81 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5B9E3B17E735C1002A0D81 /* SenTestingKit.framework */; };
4746
EA5B9E3D17E735C1002A0D81 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA16E22E17E7358100F90D98 /* Foundation.framework */; };
4847
EA5B9E4517E735C1002A0D81 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA5B9E4317E735C1002A0D81 /* InfoPlist.strings */; };
4948
EA5B9E4717E735C1002A0D81 /* CRDIContainerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5B9E4617E735C1002A0D81 /* CRDIContainerSpec.m */; };
@@ -78,13 +77,15 @@
7877
/* End PBXCopyFilesBuildPhase section */
7978

8079
/* Begin PBXFileReference section */
81-
237FFA4A0C19449FB18A9784 /* libPods-CRDISpecs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-CRDISpecs.a"; sourceTree = BUILT_PRODUCTS_DIR; };
80+
2DD3D3D9B9D27FC0B0A3A6E1 /* libPods-CRDI.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-CRDI.a"; sourceTree = BUILT_PRODUCTS_DIR; };
81+
4F23EAE9FA7EC6FF7F89C851 /* Pods-CRDI-CRDISpecs.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CRDI-CRDISpecs.release.xcconfig"; path = "Pods/Target Support Files/Pods-CRDI-CRDISpecs/Pods-CRDI-CRDISpecs.release.xcconfig"; sourceTree = "<group>"; };
8282
68ACD69817E75411003BA236 /* CRDiSingletoneBuilderSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CRDiSingletoneBuilderSpec.m; sourceTree = "<group>"; };
8383
68ACD69B17E75956003BA236 /* CRDISingletoneBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRDISingletoneBuilder.h; sourceTree = "<group>"; };
8484
68ACD69C17E75956003BA236 /* CRDISingletoneBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CRDISingletoneBuilder.m; sourceTree = "<group>"; };
85+
6EF3094348254D4541073C5C /* Pods-CRDI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CRDI.release.xcconfig"; path = "Pods/Target Support Files/Pods-CRDI/Pods-CRDI.release.xcconfig"; sourceTree = "<group>"; };
8586
7EAB936A1C6B8A27009907EA /* CRDIErrorHandlerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRDIErrorHandlerProtocol.h; sourceTree = "<group>"; };
86-
942E706A687C456799F5BBF6 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
87-
A9327771A74846319CA6BF9E /* Pods-CRDISpecs.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CRDISpecs.xcconfig"; path = "Pods/Pods-CRDISpecs.xcconfig"; sourceTree = "<group>"; };
87+
87A1BE8425693B9DD586C221 /* Pods-CRDI-CRDISpecs.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CRDI-CRDISpecs.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CRDI-CRDISpecs/Pods-CRDI-CRDISpecs.debug.xcconfig"; sourceTree = "<group>"; };
88+
A77FE5334F779D7027EA9D02 /* Pods-CRDI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CRDI.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CRDI/Pods-CRDI.debug.xcconfig"; sourceTree = "<group>"; };
8889
AD1857C117E9C8D700B0A886 /* CRDIPropertyNameMatcherSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CRDIPropertyNameMatcherSpec.m; sourceTree = "<group>"; };
8990
AD24C80A17E9D8BA00E0ED9E /* CRDIAutoInjector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRDIAutoInjector.h; sourceTree = "<group>"; };
9091
AD24C80B17E9D8BA00E0ED9E /* CRDIAutoInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CRDIAutoInjector.m; sourceTree = "<group>"; };
@@ -127,7 +128,7 @@
127128
EA5B9E2D17E735B2002A0D81 /* CRDIInjector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRDIInjector.h; sourceTree = "<group>"; };
128129
EA5B9E2E17E735B2002A0D81 /* CRDIInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CRDIInjector.m; sourceTree = "<group>"; };
129130
EA5B9E3017E735B2002A0D81 /* CRDIDependencyBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRDIDependencyBuilder.h; sourceTree = "<group>"; };
130-
EA5B9E3A17E735C1002A0D81 /* CRDISpecs.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CRDISpecs.octest; sourceTree = BUILT_PRODUCTS_DIR; };
131+
EA5B9E3A17E735C1002A0D81 /* CRDISpecs.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CRDISpecs.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
131132
EA5B9E3B17E735C1002A0D81 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
132133
EA5B9E4217E735C1002A0D81 /* CRDI Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "CRDI Tests-Info.plist"; sourceTree = "<group>"; };
133134
EA5B9E4417E735C1002A0D81 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -139,7 +140,7 @@
139140
EA5B9E5417E739AA002A0D81 /* CRDISampleClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CRDISampleClass.m; sourceTree = "<group>"; };
140141
EA5B9E5517E739AA002A0D81 /* CRDISampleProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRDISampleProtocol.h; sourceTree = "<group>"; };
141142
EA5B9E5C17E73C94002A0D81 /* CRDIBuilderSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CRDIBuilderSpec.m; sourceTree = "<group>"; };
142-
F9BD4F43A3CD4BC6BC0014EA /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; };
143+
F83096A83EEE5F6A1A31A231 /* libPods-CRDI-CRDISpecs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-CRDI-CRDISpecs.a"; sourceTree = BUILT_PRODUCTS_DIR; };
143144
/* End PBXFileReference section */
144145

145146
/* Begin PBXFrameworksBuildPhase section */
@@ -148,7 +149,7 @@
148149
buildActionMask = 2147483647;
149150
files = (
150151
EA16E22F17E7358100F90D98 /* Foundation.framework in Frameworks */,
151-
E25764918F7C42B1801BDC47 /* libPods.a in Frameworks */,
152+
697CFAB257A5402569F6B144 /* libPods-CRDI.a in Frameworks */,
152153
);
153154
runOnlyForDeploymentPostprocessing = 0;
154155
};
@@ -157,8 +158,7 @@
157158
buildActionMask = 2147483647;
158159
files = (
159160
EA5B9E3D17E735C1002A0D81 /* Foundation.framework in Frameworks */,
160-
EA5B9E3C17E735C1002A0D81 /* SenTestingKit.framework in Frameworks */,
161-
4A8DAB7A2B134E5585DBAADE /* libPods-CRDISpecs.a in Frameworks */,
161+
35D6C2A84BBF9D7B50DDAF5C /* libPods-CRDI-CRDISpecs.a in Frameworks */,
162162
);
163163
runOnlyForDeploymentPostprocessing = 0;
164164
};
@@ -174,6 +174,17 @@
174174
path = DISingletoneBuilder;
175175
sourceTree = "<group>";
176176
};
177+
73751C181BB09531E6744B85 /* Pods */ = {
178+
isa = PBXGroup;
179+
children = (
180+
A77FE5334F779D7027EA9D02 /* Pods-CRDI.debug.xcconfig */,
181+
6EF3094348254D4541073C5C /* Pods-CRDI.release.xcconfig */,
182+
87A1BE8425693B9DD586C221 /* Pods-CRDI-CRDISpecs.debug.xcconfig */,
183+
4F23EAE9FA7EC6FF7F89C851 /* Pods-CRDI-CRDISpecs.release.xcconfig */,
184+
);
185+
name = Pods;
186+
sourceTree = "<group>";
187+
};
177188
AD24C80917E9D8AA00E0ED9E /* AutoInjector */ = {
178189
isa = PBXGroup;
179190
children = (
@@ -243,16 +254,15 @@
243254
EA5B9E4017E735C1002A0D81 /* CRDI Tests */,
244255
EA16E22D17E7358100F90D98 /* Frameworks */,
245256
EA16E22C17E7358100F90D98 /* Products */,
246-
A9327771A74846319CA6BF9E /* Pods-CRDISpecs.xcconfig */,
247-
F9BD4F43A3CD4BC6BC0014EA /* Pods.xcconfig */,
257+
73751C181BB09531E6744B85 /* Pods */,
248258
);
249259
sourceTree = "<group>";
250260
};
251261
EA16E22C17E7358100F90D98 /* Products */ = {
252262
isa = PBXGroup;
253263
children = (
254264
EA16E22B17E7358100F90D98 /* libCRDI.a */,
255-
EA5B9E3A17E735C1002A0D81 /* CRDISpecs.octest */,
265+
EA5B9E3A17E735C1002A0D81 /* CRDISpecs.xctest */,
256266
);
257267
name = Products;
258268
sourceTree = "<group>";
@@ -262,8 +272,8 @@
262272
children = (
263273
EA16E22E17E7358100F90D98 /* Foundation.framework */,
264274
EA5B9E3B17E735C1002A0D81 /* SenTestingKit.framework */,
265-
237FFA4A0C19449FB18A9784 /* libPods-CRDISpecs.a */,
266-
942E706A687C456799F5BBF6 /* libPods.a */,
275+
2DD3D3D9B9D27FC0B0A3A6E1 /* libPods-CRDI.a */,
276+
F83096A83EEE5F6A1A31A231 /* libPods-CRDI-CRDISpecs.a */,
267277
);
268278
name = Frameworks;
269279
sourceTree = "<group>";
@@ -424,11 +434,11 @@
424434
isa = PBXNativeTarget;
425435
buildConfigurationList = EA16E23917E7358100F90D98 /* Build configuration list for PBXNativeTarget "CRDI" */;
426436
buildPhases = (
427-
551611F93C4F48409368A111 /* Check Pods Manifest.lock */,
437+
EC20737295089014405F73AF /* [CP] Check Pods Manifest.lock */,
428438
EA16E22717E7358100F90D98 /* Sources */,
429439
EA16E22817E7358100F90D98 /* Frameworks */,
430440
EA16E22917E7358100F90D98 /* CopyFiles */,
431-
5B1FE226F4B44ECBBECC81EF /* Copy Pods Resources */,
441+
65F68FBF3C8B46019D9254DA /* [CP] Copy Pods Resources */,
432442
);
433443
buildRules = (
434444
);
@@ -443,11 +453,11 @@
443453
isa = PBXNativeTarget;
444454
buildConfigurationList = EA5B9E4B17E735C1002A0D81 /* Build configuration list for PBXNativeTarget "CRDISpecs" */;
445455
buildPhases = (
446-
B8950B589AC54474862195E6 /* Check Pods Manifest.lock */,
456+
AAC2B1837D48979C69D53CE1 /* [CP] Check Pods Manifest.lock */,
447457
EA5B9E3617E735C1002A0D81 /* Sources */,
448458
EA5B9E3717E735C1002A0D81 /* Frameworks */,
449459
EA5B9E3817E735C1002A0D81 /* Resources */,
450-
4C64EA8D13A9431295DFE483 /* Copy Pods Resources */,
460+
62574459722858B00439770C /* [CP] Copy Pods Resources */,
451461
);
452462
buildRules = (
453463
);
@@ -456,7 +466,7 @@
456466
);
457467
name = CRDISpecs;
458468
productName = "CRDI Tests";
459-
productReference = EA5B9E3A17E735C1002A0D81 /* CRDISpecs.octest */;
469+
productReference = EA5B9E3A17E735C1002A0D81 /* CRDISpecs.xctest */;
460470
productType = "com.apple.product-type.bundle.ocunit-test";
461471
};
462472
/* End PBXNativeTarget section */
@@ -504,64 +514,71 @@
504514
/* End PBXResourcesBuildPhase section */
505515

506516
/* Begin PBXShellScriptBuildPhase section */
507-
4C64EA8D13A9431295DFE483 /* Copy Pods Resources */ = {
517+
62574459722858B00439770C /* [CP] Copy Pods Resources */ = {
508518
isa = PBXShellScriptBuildPhase;
509519
buildActionMask = 2147483647;
510520
files = (
511521
);
512522
inputPaths = (
513523
);
514-
name = "Copy Pods Resources";
524+
name = "[CP] Copy Pods Resources";
515525
outputPaths = (
516526
);
517527
runOnlyForDeploymentPostprocessing = 0;
518528
shellPath = /bin/sh;
519-
shellScript = "\"${SRCROOT}/Pods/Pods-CRDISpecs-resources.sh\"\n";
529+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CRDI-CRDISpecs/Pods-CRDI-CRDISpecs-resources.sh\"\n";
520530
showEnvVarsInLog = 0;
521531
};
522-
551611F93C4F48409368A111 /* Check Pods Manifest.lock */ = {
532+
65F68FBF3C8B46019D9254DA /* [CP] Copy Pods Resources */ = {
523533
isa = PBXShellScriptBuildPhase;
524534
buildActionMask = 2147483647;
525535
files = (
526536
);
527537
inputPaths = (
528538
);
529-
name = "Check Pods Manifest.lock";
539+
name = "[CP] Copy Pods Resources";
530540
outputPaths = (
531541
);
532542
runOnlyForDeploymentPostprocessing = 0;
533543
shellPath = /bin/sh;
534-
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";
544+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CRDI/Pods-CRDI-resources.sh\"\n";
535545
showEnvVarsInLog = 0;
536546
};
537-
5B1FE226F4B44ECBBECC81EF /* Copy Pods Resources */ = {
547+
AAC2B1837D48979C69D53CE1 /* [CP] Check Pods Manifest.lock */ = {
538548
isa = PBXShellScriptBuildPhase;
539549
buildActionMask = 2147483647;
540550
files = (
541551
);
542552
inputPaths = (
553+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
554+
"${PODS_ROOT}/Manifest.lock",
543555
);
544-
name = "Copy Pods Resources";
556+
name = "[CP] Check Pods Manifest.lock";
545557
outputPaths = (
558+
"$(DERIVED_FILE_DIR)/Pods-CRDI-CRDISpecs-checkManifestLockResult.txt",
546559
);
547560
runOnlyForDeploymentPostprocessing = 0;
548561
shellPath = /bin/sh;
549-
shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
562+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
550563
showEnvVarsInLog = 0;
551564
};
552-
B8950B589AC54474862195E6 /* Check Pods Manifest.lock */ = {
565+
EC20737295089014405F73AF /* [CP] Check Pods Manifest.lock */ = {
553566
isa = PBXShellScriptBuildPhase;
554567
buildActionMask = 2147483647;
555568
files = (
556569
);
557570
inputPaths = (
571+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
572+
"${PODS_ROOT}/Manifest.lock",
558573
);
559-
name = "Check Pods Manifest.lock";
574+
name = "[CP] Check Pods Manifest.lock";
560575
outputPaths = (
576+
"$(DERIVED_FILE_DIR)/Pods-CRDI-checkManifestLockResult.txt",
561577
);
562578
runOnlyForDeploymentPostprocessing = 0;
563579
shellPath = /bin/sh;
564-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sanbox is not in sync with the Podfile.lock. Run 'pod install'.\nEOM\n exit 1\nfi\n";
580+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
581+
showEnvVarsInLog = 0;
565582
};
566583
/* End PBXShellScriptBuildPhase section */
567584

@@ -700,7 +717,7 @@
700717
};
701718
EA16E23A17E7358100F90D98 /* Debug */ = {
702719
isa = XCBuildConfiguration;
703-
baseConfigurationReference = F9BD4F43A3CD4BC6BC0014EA /* Pods.xcconfig */;
720+
baseConfigurationReference = A77FE5334F779D7027EA9D02 /* Pods-CRDI.debug.xcconfig */;
704721
buildSettings = {
705722
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
706723
DSTROOT = /tmp/CRDI.dst;
@@ -716,7 +733,7 @@
716733
};
717734
EA16E23B17E7358100F90D98 /* Release */ = {
718735
isa = XCBuildConfiguration;
719-
baseConfigurationReference = F9BD4F43A3CD4BC6BC0014EA /* Pods.xcconfig */;
736+
baseConfigurationReference = 6EF3094348254D4541073C5C /* Pods-CRDI.release.xcconfig */;
720737
buildSettings = {
721738
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
722739
DSTROOT = /tmp/CRDI.dst;
@@ -732,7 +749,7 @@
732749
};
733750
EA5B9E4C17E735C1002A0D81 /* Debug */ = {
734751
isa = XCBuildConfiguration;
735-
baseConfigurationReference = A9327771A74846319CA6BF9E /* Pods-CRDISpecs.xcconfig */;
752+
baseConfigurationReference = 87A1BE8425693B9DD586C221 /* Pods-CRDI-CRDISpecs.debug.xcconfig */;
736753
buildSettings = {
737754
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
738755
CLANG_ENABLE_MODULES = YES;
@@ -755,18 +772,18 @@
755772
GCC_WARN_UNDECLARED_SELECTOR = YES;
756773
GCC_WARN_UNUSED_FUNCTION = YES;
757774
INFOPLIST_FILE = "CRDI Tests/CRDI Tests-Info.plist";
758-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
775+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
759776
ONLY_ACTIVE_ARCH = NO;
760777
PRODUCT_NAME = "$(TARGET_NAME)";
761778
SDKROOT = iphoneos;
762779
VALID_ARCHS = "armv7 armv7s i386";
763-
WRAPPER_EXTENSION = octest;
780+
WRAPPER_EXTENSION = xctest;
764781
};
765782
name = Debug;
766783
};
767784
EA5B9E4D17E735C1002A0D81 /* Release */ = {
768785
isa = XCBuildConfiguration;
769-
baseConfigurationReference = A9327771A74846319CA6BF9E /* Pods-CRDISpecs.xcconfig */;
786+
baseConfigurationReference = 4F23EAE9FA7EC6FF7F89C851 /* Pods-CRDI-CRDISpecs.release.xcconfig */;
770787
buildSettings = {
771788
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
772789
CLANG_ENABLE_MODULES = YES;
@@ -786,12 +803,12 @@
786803
GCC_WARN_UNDECLARED_SELECTOR = YES;
787804
GCC_WARN_UNUSED_FUNCTION = YES;
788805
INFOPLIST_FILE = "CRDI Tests/CRDI Tests-Info.plist";
789-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
806+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
790807
ONLY_ACTIVE_ARCH = NO;
791808
PRODUCT_NAME = "$(TARGET_NAME)";
792809
SDKROOT = iphoneos;
793810
VALID_ARCHS = "armv7 armv7s i386";
794-
WRAPPER_EXTENSION = octest;
811+
WRAPPER_EXTENSION = xctest;
795812
};
796813
name = Release;
797814
};

0 commit comments

Comments
 (0)