Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit b25ee9f

Browse files
calebdcalebd
committed
Project changes.
- Fixes bug where OS X test suite never actually ran any tests - No longer copies nested framework dependencies
1 parent df1edd0 commit b25ee9f

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

‎CMDQueryStringSerialization.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
3634A0951B1CC25500B1C866 /* CategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3634A0941B1CC25500B1C866 /* CategoryTests.m */; };
11+
3B03D19D1B279D9F00EF57EC /* ISO8601.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BEA1D0C1AFB43CC0006A6E8 /* ISO8601.framework */; };
12+
3B03D19E1B279DA300EF57EC /* ISO8601.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BFF27FD1B1EDC81001E0555 /* ISO8601.framework */; };
13+
3B03D1A01B279F6000EF57EC /* ISO8601.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BFF27FD1B1EDC81001E0555 /* ISO8601.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14+
3B03D1A21B279F8100EF57EC /* ISO8601.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BEA1D0C1AFB43CC0006A6E8 /* ISO8601.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
15+
3B03D1A31B279FAA00EF57EC /* SerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BEA1CEB1AFB40E50006A6E8 /* SerializationTests.m */; };
16+
3B03D1A41B279FAA00EF57EC /* CategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3634A0941B1CC25500B1C866 /* CategoryTests.m */; };
1117
3B65D3D61B17DC3D006293B6 /* NSURL+CMDQueryStringSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B65D3D41B17DC3D006293B6 /* NSURL+CMDQueryStringSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
1218
3B65D3D71B17DC3D006293B6 /* NSURL+CMDQueryStringSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B65D3D51B17DC3D006293B6 /* NSURL+CMDQueryStringSerialization.m */; };
1319
3BEA1CE51AFB40E50006A6E8 /* CMDQueryStringSerialization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BEA1CD91AFB40E40006A6E8 /* CMDQueryStringSerialization.framework */; };
@@ -22,10 +28,8 @@
2228
3BEA1D071AFB41370006A6E8 /* NSString+CMDQueryStringSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BEA1CFD1AFB41370006A6E8 /* NSString+CMDQueryStringSerialization.h */; };
2329
3BEA1D081AFB41370006A6E8 /* NSString+CMDQueryStringSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BEA1CFE1AFB41370006A6E8 /* NSString+CMDQueryStringSerialization.m */; };
2430
3BEA1D0E1AFB43DE0006A6E8 /* ISO8601.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BEA1D0C1AFB43CC0006A6E8 /* ISO8601.framework */; };
25-
3BEA1D101AFB43F50006A6E8 /* ISO8601.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 3BEA1D0C1AFB43CC0006A6E8 /* ISO8601.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2631
3BFF27EF1B1EDBE1001E0555 /* CMDQueryStringSerialization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BFF27E41B1EDBE0001E0555 /* CMDQueryStringSerialization.framework */; };
2732
3BFF27FE1B1EDC89001E0555 /* ISO8601.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BFF27FD1B1EDC81001E0555 /* ISO8601.framework */; };
28-
3BFF28001B1EDC9A001E0555 /* ISO8601.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BFF27FD1B1EDC81001E0555 /* ISO8601.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2933
3BFF28011B1EDCC5001E0555 /* CMDQueryStringSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BEA1CF71AFB41370006A6E8 /* CMDQueryStringSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
3034
3BFF28021B1EDCC5001E0555 /* CMDQueryStringSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BEA1CF81AFB41370006A6E8 /* CMDQueryStringSerialization.m */; };
3135
3BFF28031B1EDCC5001E0555 /* CMDQueryStringWritingOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BEA1CFB1AFB41370006A6E8 /* CMDQueryStringWritingOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -57,24 +61,23 @@
5761
/* End PBXContainerItemProxy section */
5862

5963
/* Begin PBXCopyFilesBuildPhase section */
60-
3BEA1D0F1AFB43E90006A6E8 /* Copy Frameworks */ = {
64+
3B03D19F1B279F5A00EF57EC /* CopyFiles */ = {
6165
isa = PBXCopyFilesBuildPhase;
6266
buildActionMask = 2147483647;
6367
dstPath = "";
6468
dstSubfolderSpec = 10;
6569
files = (
66-
3BEA1D101AFB43F50006A6E8 /* ISO8601.framework in Copy Frameworks */,
70+
3B03D1A01B279F6000EF57EC /* ISO8601.framework in CopyFiles */,
6771
);
68-
name = "Copy Frameworks";
6972
runOnlyForDeploymentPostprocessing = 0;
7073
};
71-
3BFF27FF1B1EDC91001E0555 /* CopyFiles */ = {
74+
3B03D1A11B279F7F00EF57EC /* CopyFiles */ = {
7275
isa = PBXCopyFilesBuildPhase;
7376
buildActionMask = 2147483647;
7477
dstPath = "";
7578
dstSubfolderSpec = 10;
7679
files = (
77-
3BFF28001B1EDC9A001E0555 /* ISO8601.framework in CopyFiles */,
80+
3B03D1A21B279F8100EF57EC /* ISO8601.framework in CopyFiles */,
7881
);
7982
runOnlyForDeploymentPostprocessing = 0;
8083
};
@@ -100,7 +103,7 @@
100103
3BEA1CFE1AFB41370006A6E8 /* NSString+CMDQueryStringSerialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+CMDQueryStringSerialization.m"; sourceTree = "<group>"; };
101104
3BEA1D0C1AFB43CC0006A6E8 /* ISO8601.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ISO8601.framework; path = Carthage/Build/iOS/ISO8601.framework; sourceTree = "<group>"; };
102105
3BFF27E41B1EDBE0001E0555 /* CMDQueryStringSerialization.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CMDQueryStringSerialization.framework; sourceTree = BUILT_PRODUCTS_DIR; };
103-
3BFF27EE1B1EDBE0001E0555 /* OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "OSX Tests.xctest"; path = "OS X Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
106+
3BFF27EE1B1EDBE0001E0555 /* OS X Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OS X Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
104107
3BFF27FD1B1EDC81001E0555 /* ISO8601.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ISO8601.framework; path = Carthage/Build/Mac/ISO8601.framework; sourceTree = "<group>"; };
105108
/* End PBXFileReference section */
106109

@@ -118,6 +121,7 @@
118121
buildActionMask = 2147483647;
119122
files = (
120123
3BEA1CE51AFB40E50006A6E8 /* CMDQueryStringSerialization.framework in Frameworks */,
124+
3B03D19D1B279D9F00EF57EC /* ISO8601.framework in Frameworks */,
121125
);
122126
runOnlyForDeploymentPostprocessing = 0;
123127
};
@@ -134,6 +138,7 @@
134138
buildActionMask = 2147483647;
135139
files = (
136140
3BFF27EF1B1EDBE1001E0555 /* CMDQueryStringSerialization.framework in Frameworks */,
141+
3B03D19E1B279DA300EF57EC /* ISO8601.framework in Frameworks */,
137142
);
138143
runOnlyForDeploymentPostprocessing = 0;
139144
};
@@ -156,7 +161,7 @@
156161
3BEA1CD91AFB40E40006A6E8 /* CMDQueryStringSerialization.framework */,
157162
3BEA1CE41AFB40E50006A6E8 /* iOS Tests.xctest */,
158163
3BFF27E41B1EDBE0001E0555 /* CMDQueryStringSerialization.framework */,
159-
3BFF27EE1B1EDBE0001E0555 /* OSX Tests.xctest */,
164+
3BFF27EE1B1EDBE0001E0555 /* OS X Tests.xctest */,
160165
);
161166
name = Products;
162167
sourceTree = "<group>";
@@ -239,7 +244,6 @@
239244
3BEA1CD51AFB40E40006A6E8 /* Frameworks */,
240245
3BEA1CD61AFB40E40006A6E8 /* Headers */,
241246
3BEA1CD71AFB40E40006A6E8 /* Resources */,
242-
3BEA1D0F1AFB43E90006A6E8 /* Copy Frameworks */,
243247
);
244248
buildRules = (
245249
);
@@ -257,6 +261,7 @@
257261
3BEA1CE01AFB40E50006A6E8 /* Sources */,
258262
3BEA1CE11AFB40E50006A6E8 /* Frameworks */,
259263
3BEA1CE21AFB40E50006A6E8 /* Resources */,
264+
3B03D1A11B279F7F00EF57EC /* CopyFiles */,
260265
);
261266
buildRules = (
262267
);
@@ -276,7 +281,6 @@
276281
3BFF27E01B1EDBE0001E0555 /* Frameworks */,
277282
3BFF27E11B1EDBE0001E0555 /* Headers */,
278283
3BFF27E21B1EDBE0001E0555 /* Resources */,
279-
3BFF27FF1B1EDC91001E0555 /* CopyFiles */,
280284
);
281285
buildRules = (
282286
);
@@ -294,6 +298,7 @@
294298
3BFF27EA1B1EDBE0001E0555 /* Sources */,
295299
3BFF27EB1B1EDBE0001E0555 /* Frameworks */,
296300
3BFF27EC1B1EDBE0001E0555 /* Resources */,
301+
3B03D19F1B279F5A00EF57EC /* CopyFiles */,
297302
);
298303
buildRules = (
299304
);
@@ -302,7 +307,7 @@
302307
);
303308
name = "OS X Tests";
304309
productName = "CMDQueryStringSerialization-OSXTests";
305-
productReference = 3BFF27EE1B1EDBE0001E0555 /* OSX Tests.xctest */;
310+
productReference = 3BFF27EE1B1EDBE0001E0555 /* OS X Tests.xctest */;
306311
productType = "com.apple.product-type.bundle.unit-test";
307312
};
308313
/* End PBXNativeTarget section */
@@ -417,6 +422,8 @@
417422
isa = PBXSourcesBuildPhase;
418423
buildActionMask = 2147483647;
419424
files = (
425+
3B03D1A31B279FAA00EF57EC /* SerializationTests.m in Sources */,
426+
3B03D1A41B279FAA00EF57EC /* CategoryTests.m in Sources */,
420427
);
421428
runOnlyForDeploymentPostprocessing = 0;
422429
};
@@ -653,6 +660,7 @@
653660
FRAMEWORK_SEARCH_PATHS = (
654661
"$(DEVELOPER_FRAMEWORKS_DIR)",
655662
"$(inherited)",
663+
"$(PROJECT_DIR)/Carthage/Build/Mac",
656664
);
657665
GCC_PREPROCESSOR_DEFINITIONS = (
658666
"DEBUG=1",
@@ -673,6 +681,7 @@
673681
FRAMEWORK_SEARCH_PATHS = (
674682
"$(DEVELOPER_FRAMEWORKS_DIR)",
675683
"$(inherited)",
684+
"$(PROJECT_DIR)/Carthage/Build/Mac",
676685
);
677686
INFOPLIST_FILE = CMDQueryStringSerializationTests/Info.plist;
678687
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";

0 commit comments

Comments
 (0)