Skip to content

Commit b37a2e4

Browse files
nlutsenkonlutsenko
committed
Use only dynamic framework version of OCMock.
1 parent fb01705 commit b37a2e4

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

‎Configurations/ParseUnitTests-OSX.xcconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.osx
1717
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist
1818
LD_RUNPATH_SEARCH_PATHS = $(inherited) @loader_path/../Frameworks
1919

20-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/osx
20+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/osx
2121

22-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
2322
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
2423

2524
// Swift

‎Configurations/ParseUnitTests-iOS.xcconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ PRODUCT_NAME = ParseUnitTests-iOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
1515
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios
1616

17+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
18+
1719
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
18-
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
1920

20-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/ios
21+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/ios
2122

22-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
2323
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
2424

2525
// Swift

‎Parse.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@
385385
812714891AE6F1270076AE8D /* ParseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 812714861AE6F1270076AE8D /* ParseManager.h */; };
386386
8127148A1AE6F1270076AE8D /* ParseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 812714871AE6F1270076AE8D /* ParseManager.m */; };
387387
8127148B1AE6F1270076AE8D /* ParseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 812714871AE6F1270076AE8D /* ParseManager.m */; };
388-
8129E47B1B84265800309634 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BB1B7E7ECC0053210E /* libOCMock.a */; };
389388
812B02961B5DE3EE003846EE /* PFURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02921B5DE3EE003846EE /* PFURLSession.h */; };
390389
812B02971B5DE3EE003846EE /* PFURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 812B02921B5DE3EE003846EE /* PFURLSession.h */; };
391390
812B02981B5DE3EE003846EE /* PFURLSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 812B02931B5DE3EE003846EE /* PFURLSession.m */; };
@@ -1232,8 +1231,6 @@
12321231
81A715A51B423A4100A504FC /* PFObjectUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A715A21B423A4100A504FC /* PFObjectUtilities.h */; };
12331232
81A715A61B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
12341233
81A715A71B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
1235-
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; };
1236-
81AB68C91B7E7F460053210E /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
12371234
81ABC0FE1B5427EC00BA9009 /* PFUserController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81ABC0FC1B5427EC00BA9009 /* PFUserController.h */; };
12381235
81ABC0FF1B5427EC00BA9009 /* PFUserController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81ABC0FC1B5427EC00BA9009 /* PFUserController.h */; };
12391236
81ABC1001B5427EC00BA9009 /* PFUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81ABC0FD1B5427EC00BA9009 /* PFUserController.m */; };
@@ -1426,6 +1423,8 @@
14261423
81E033721B573FC500B25168 /* PFTestSKProductsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E0336D1B573FC500B25168 /* PFTestSKProductsResponse.m */; };
14271424
81E0337E1B57441F00B25168 /* CLLocationManager+TestAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E0337D1B57441F00B25168 /* CLLocationManager+TestAdditions.m */; };
14281425
81E0337F1B57441F00B25168 /* CLLocationManager+TestAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E0337D1B57441F00B25168 /* CLLocationManager+TestAdditions.m */; };
1426+
81E124CF1C33698E007FB57F /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; };
1427+
81E124D01C336992007FB57F /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BF1B7E7ECC0053210E /* OCMock.framework */; };
14291428
81E7A21C1B602560006CB680 /* PFUserFileCodingLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 81E7A21A1B602560006CB680 /* PFUserFileCodingLogic.h */; };
14301429
81E7A21D1B602560006CB680 /* PFUserFileCodingLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 81E7A21A1B602560006CB680 /* PFUserFileCodingLogic.h */; };
14311430
81E7A21E1B602560006CB680 /* PFUserFileCodingLogic.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E7A21B1B602560006CB680 /* PFUserFileCodingLogic.m */; };
@@ -1675,6 +1674,13 @@
16751674
remoteGlobalIDString = 815F241A1BD04DBB0054659F;
16761675
remoteInfo = "Bolts-tvOS";
16771676
};
1677+
819E9C0C1C336918008074CC /* PBXContainerItemProxy */ = {
1678+
isa = PBXContainerItemProxy;
1679+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
1680+
proxyType = 1;
1681+
remoteGlobalIDString = F0B950F01B0080BE00942C38;
1682+
remoteInfo = "OCMock iOS";
1683+
};
16781684
81AB68B61B7E7ECC0053210E /* PBXContainerItemProxy */ = {
16791685
isa = PBXContainerItemProxy;
16801686
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
@@ -1743,7 +1749,6 @@
17431749
dstPath = "";
17441750
dstSubfolderSpec = 10;
17451751
files = (
1746-
81AB68C91B7E7F460053210E /* OCMock.framework in Copy Frameworks */,
17471752
81C09F8D1AF9816D0043B49C /* Bolts.framework in Copy Frameworks */,
17481753
);
17491754
name = "Copy Frameworks";
@@ -2337,12 +2342,12 @@
23372342
isa = PBXFrameworksBuildPhase;
23382343
buildActionMask = 2147483647;
23392344
files = (
2340-
8129E47B1B84265800309634 /* libOCMock.a in Frameworks */,
23412345
816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */,
23422346
F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */,
23432347
816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */,
23442348
816F44771A8E8933009CDB32 /* libsqlite3.dylib in Frameworks */,
23452349
816F44781A8E8933009CDB32 /* Accounts.framework in Frameworks */,
2350+
81E124D01C336992007FB57F /* OCMock.framework in Frameworks */,
23462351
816F44791A8E8933009CDB32 /* Social.framework in Frameworks */,
23472352
816F447C1A8E8933009CDB32 /* Bolts.framework in Frameworks */,
23482353
F5B0B3151B44A21100F3EBC4 /* SystemConfiguration.framework in Frameworks */,
@@ -2353,7 +2358,7 @@
23532358
isa = PBXFrameworksBuildPhase;
23542359
buildActionMask = 2147483647;
23552360
files = (
2356-
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */,
2361+
81E124CF1C33698E007FB57F /* OCMock.framework in Frameworks */,
23572362
F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */,
23582363
81C09F891AF97EA70043B49C /* Parse.framework in Frameworks */,
23592364
815868E21AF9818D009A5751 /* Bolts.framework in Frameworks */,
@@ -4895,6 +4900,7 @@
48954900
buildRules = (
48964901
);
48974902
dependencies = (
4903+
819E9C0D1C336918008074CC /* PBXTargetDependency */,
48984904
8111674C1B8402DF003CB026 /* PBXTargetDependency */,
48994905
);
49004906
name = "ParseUnitTests-iOS";
@@ -6028,6 +6034,11 @@
60286034
target = 815F241A1BD04DBB0054659F /* Bolts-tvOS */;
60296035
targetProxy = 815F241E1BD04DE00054659F /* PBXContainerItemProxy */;
60306036
};
6037+
819E9C0D1C336918008074CC /* PBXTargetDependency */ = {
6038+
isa = PBXTargetDependency;
6039+
name = "OCMock iOS";
6040+
targetProxy = 819E9C0C1C336918008074CC /* PBXContainerItemProxy */;
6041+
};
60316042
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */ = {
60326043
isa = PBXTargetDependency;
60336044
name = OCMock;

0 commit comments

Comments
 (0)