Skip to content

Commit 0511d91

Browse files
committed
Use static library for OCMock in tests to unbreak Xcode 7.
1 parent 718fb97 commit 0511d91

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

Configurations/ParseUnitTests-iOS.xcconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ PRODUCT_NAME = ParseUnitTests-iOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
1515

1616
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
17+
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(BUILT_PRODUCTS_DIR)/../Release$(EFFECTIVE_PLATFORM_NAME)
1718

18-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(VENDOR_DIR)/Bolts-ObjC/build/ios $(BUILT_PRODUCTS_DIR)/../Release$(EFFECTIVE_PLATFORM_NAME)
19+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(VENDOR_DIR)/Bolts-ObjC/build/ios
1920

20-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
21+
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(BUILT_PRODUCTS_DIR)/../Release$(EFFECTIVE_PLATFORM_NAME)
2122
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
2223

2324
// Swift

Parse.xcodeproj/project.pbxproj

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
812714891AE6F1270076AE8D /* ParseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 812714861AE6F1270076AE8D /* ParseManager.h */; };
7777
8127148A1AE6F1270076AE8D /* ParseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 812714871AE6F1270076AE8D /* ParseManager.m */; };
7878
8127148B1AE6F1270076AE8D /* ParseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 812714871AE6F1270076AE8D /* ParseManager.m */; };
79+
8129E47B1B84265800309634 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BB1B7E7ECC0053210E /* libOCMock.a */; };
7980
812B02961B5DE3EE003846EE /* PFURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02921B5DE3EE003846EE /* PFURLSession.h */; };
8081
812B02971B5DE3EE003846EE /* PFURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02921B5DE3EE003846EE /* PFURLSession.h */; };
8182
812B02981B5DE3EE003846EE /* PFURLSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 812B02931B5DE3EE003846EE /* PFURLSession.m */; };
@@ -553,7 +554,6 @@
553554
81A715A51B423A4100A504FC /* PFObjectUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A715A21B423A4100A504FC /* PFObjectUtilities.h */; };
554555
81A715A61B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
555556
81A715A71B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
556-
81AB68C01B7E7EE20053210E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BF1B7E7ECC0053210E /* OCMock.framework */; };
557557
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; };
558558
81AB68C91B7E7F460053210E /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
559559
81AB68CB1B7E7F970053210E /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BF1B7E7ECC0053210E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -961,13 +961,6 @@
961961
remoteGlobalIDString = F0B950F11B0080BE00942C38;
962962
remoteInfo = "OCMock iOS";
963963
};
964-
81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */ = {
965-
isa = PBXContainerItemProxy;
966-
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
967-
proxyType = 1;
968-
remoteGlobalIDString = F0B950F01B0080BE00942C38;
969-
remoteInfo = "OCMock iOS";
970-
};
971964
81AB68C71B7E7F2A0053210E /* PBXContainerItemProxy */ = {
972965
isa = PBXContainerItemProxy;
973966
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
@@ -1542,7 +1535,7 @@
15421535
isa = PBXFrameworksBuildPhase;
15431536
buildActionMask = 2147483647;
15441537
files = (
1545-
81AB68C01B7E7EE20053210E /* OCMock.framework in Frameworks */,
1538+
8129E47B1B84265800309634 /* libOCMock.a in Frameworks */,
15461539
816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */,
15471540
F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */,
15481541
816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */,
@@ -3537,7 +3530,6 @@
35373530
buildRules = (
35383531
);
35393532
dependencies = (
3540-
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */,
35413533
);
35423534
name = "ParseUnitTests-iOS";
35433535
productName = ParseTests;
@@ -4292,11 +4284,6 @@
42924284
target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;
42934285
targetProxy = 81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */;
42944286
};
4295-
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */ = {
4296-
isa = PBXTargetDependency;
4297-
name = "OCMock iOS";
4298-
targetProxy = 81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */;
4299-
};
43004287
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */ = {
43014288
isa = PBXTargetDependency;
43024289
name = OCMock;

0 commit comments

Comments
 (0)