Skip to content

Commit 0d70400

Browse files
committed
Use static library for OCMock in tests to unbreak Xcode 7.
1 parent be24dbf commit 0d70400

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
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 & 14 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, ); }; };
@@ -974,13 +974,6 @@
974974
remoteGlobalIDString = F0B950F11B0080BE00942C38;
975975
remoteInfo = "OCMock iOS";
976976
};
977-
81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */ = {
978-
isa = PBXContainerItemProxy;
979-
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
980-
proxyType = 1;
981-
remoteGlobalIDString = F0B950F01B0080BE00942C38;
982-
remoteInfo = "OCMock iOS";
983-
};
984977
81AB68C71B7E7F2A0053210E /* PBXContainerItemProxy */ = {
985978
isa = PBXContainerItemProxy;
986979
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
@@ -1554,7 +1547,7 @@
15541547
isa = PBXFrameworksBuildPhase;
15551548
buildActionMask = 2147483647;
15561549
files = (
1557-
81AB68C01B7E7EE20053210E /* OCMock.framework in Frameworks */,
1550+
8129E47B1B84265800309634 /* libOCMock.a in Frameworks */,
15581551
816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */,
15591552
F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */,
15601553
816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */,
@@ -4306,11 +4299,6 @@
43064299
target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;
43074300
targetProxy = 81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */;
43084301
};
4309-
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */ = {
4310-
isa = PBXTargetDependency;
4311-
name = "OCMock iOS";
4312-
targetProxy = 81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */;
4313-
};
43144302
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */ = {
43154303
isa = PBXTargetDependency;
43164304
name = OCMock;

0 commit comments

Comments
 (0)