Skip to content

Use static library for OCMock in tests to unbreak Xcode 7. #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2015
Merged

Use static library for OCMock in tests to unbreak Xcode 7. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Configurations/ParseUnitTests-iOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ PRODUCT_NAME = ParseUnitTests-iOS
PRODUCT_MODULE_NAME = ParseUnitTests

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

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

HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(BUILT_PRODUCTS_DIR)/../Release$(EFFECTIVE_PLATFORM_NAME)
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**

// Swift
Expand Down
16 changes: 2 additions & 14 deletions Parse.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
812714891AE6F1270076AE8D /* ParseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 812714861AE6F1270076AE8D /* ParseManager.h */; };
8127148A1AE6F1270076AE8D /* ParseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 812714871AE6F1270076AE8D /* ParseManager.m */; };
8127148B1AE6F1270076AE8D /* ParseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 812714871AE6F1270076AE8D /* ParseManager.m */; };
8129E47B1B84265800309634 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BB1B7E7ECC0053210E /* libOCMock.a */; };
812B02961B5DE3EE003846EE /* PFURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02921B5DE3EE003846EE /* PFURLSession.h */; };
812B02971B5DE3EE003846EE /* PFURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02921B5DE3EE003846EE /* PFURLSession.h */; };
812B02981B5DE3EE003846EE /* PFURLSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 812B02931B5DE3EE003846EE /* PFURLSession.m */; };
Expand Down Expand Up @@ -553,7 +554,6 @@
81A715A51B423A4100A504FC /* PFObjectUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A715A21B423A4100A504FC /* PFObjectUtilities.h */; };
81A715A61B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
81A715A71B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
81AB68C01B7E7EE20053210E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BF1B7E7ECC0053210E /* OCMock.framework */; };
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; };
81AB68C91B7E7F460053210E /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
81AB68CB1B7E7F970053210E /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BF1B7E7ECC0053210E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -974,13 +974,6 @@
remoteGlobalIDString = F0B950F11B0080BE00942C38;
remoteInfo = "OCMock iOS";
};
81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F0B950F01B0080BE00942C38;
remoteInfo = "OCMock iOS";
};
81AB68C71B7E7F2A0053210E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
Expand Down Expand Up @@ -1554,7 +1547,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
81AB68C01B7E7EE20053210E /* OCMock.framework in Frameworks */,
8129E47B1B84265800309634 /* libOCMock.a in Frameworks */,
816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */,
F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */,
816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */,
Expand Down Expand Up @@ -4306,11 +4299,6 @@
target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;
targetProxy = 81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */;
};
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "OCMock iOS";
targetProxy = 81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */;
};
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = OCMock;
Expand Down