Skip to content

Commit db36476

Browse files
nlutsenkonlutsenko
committed
Merge pull request #19 from ParsePlatform/nlutsenko.ocmock
Use only frameworks from OCMock, convert to explicit reference.
2 parents 860e356 + 1321d8b commit db36476

File tree

2 files changed

+140
-13
lines changed

2 files changed

+140
-13
lines changed

‎Configurations/ParseUnitTests-iOS.xcconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ PRODUCT_MODULE_NAME = ParseUnitTests
1515

1616
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
1717

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

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

2423
// Swift

‎Parse.xcodeproj/project.pbxproj

Lines changed: 138 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -555,13 +555,14 @@
555555
81A715A51B423A4100A504FC /* PFObjectUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A715A21B423A4100A504FC /* PFObjectUtilities.h */; };
556556
81A715A61B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
557557
81A715A71B423A4100A504FC /* PFObjectUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A715A31B423A4100A504FC /* PFObjectUtilities.m */; };
558+
81AB68C01B7E7EE20053210E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BF1B7E7ECC0053210E /* OCMock.framework */; };
559+
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; };
560+
81AB68C91B7E7F460053210E /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68B71B7E7ECC0053210E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
561+
81AB68CB1B7E7F970053210E /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AB68BF1B7E7ECC0053210E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
558562
81ABC0FE1B5427EC00BA9009 /* PFUserController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81ABC0FC1B5427EC00BA9009 /* PFUserController.h */; };
559563
81ABC0FF1B5427EC00BA9009 /* PFUserController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81ABC0FC1B5427EC00BA9009 /* PFUserController.h */; };
560564
81ABC1001B5427EC00BA9009 /* PFUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81ABC0FD1B5427EC00BA9009 /* PFUserController.m */; };
561565
81ABC1011B5427EC00BA9009 /* PFUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81ABC0FD1B5427EC00BA9009 /* PFUserController.m */; };
562-
81AFA6711B0ECD4E000763C0 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AFA6701B0ECD4E000763C0 /* libOCMock.a */; };
563-
81AFA6761B0ECF90000763C0 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AFA6751B0ECF90000763C0 /* OCMock.framework */; };
564-
81AFA6771B0ECF97000763C0 /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 81AFA6751B0ECF90000763C0 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
565566
81AFE0E71A1FDB7900AB6CB3 /* PFRESTUserCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 81AFE0E51A1FDB7900AB6CB3 /* PFRESTUserCommand.h */; };
566567
81AFE0E91A1FDB7D00AB6CB3 /* PFRESTUserCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 81AFE0E61A1FDB7900AB6CB3 /* PFRESTUserCommand.m */; };
567568
81B3F2011AC5DA7600A92677 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6393F38B15D3018400C4F78D /* libsqlite3.dylib */; };
@@ -931,6 +932,55 @@
931932
remoteGlobalIDString = 81493A931A0D3492008D5504;
932933
remoteInfo = BoltsSDK;
933934
};
935+
81AB68B61B7E7ECC0053210E /* PBXContainerItemProxy */ = {
936+
isa = PBXContainerItemProxy;
937+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
938+
proxyType = 2;
939+
remoteGlobalIDString = 030EF0A814632FD000B04273;
940+
remoteInfo = OCMock;
941+
};
942+
81AB68B81B7E7ECC0053210E /* PBXContainerItemProxy */ = {
943+
isa = PBXContainerItemProxy;
944+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
945+
proxyType = 2;
946+
remoteGlobalIDString = 03565A3118F0566E003AE91E;
947+
remoteInfo = OCMockTests;
948+
};
949+
81AB68BA1B7E7ECC0053210E /* PBXContainerItemProxy */ = {
950+
isa = PBXContainerItemProxy;
951+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
952+
proxyType = 2;
953+
remoteGlobalIDString = 030EF0DC14632FF700B04273;
954+
remoteInfo = OCMockLib;
955+
};
956+
81AB68BC1B7E7ECC0053210E /* PBXContainerItemProxy */ = {
957+
isa = PBXContainerItemProxy;
958+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
959+
proxyType = 2;
960+
remoteGlobalIDString = D31108AD1828DB8700737925;
961+
remoteInfo = OCMockLibTests;
962+
};
963+
81AB68BE1B7E7ECC0053210E /* PBXContainerItemProxy */ = {
964+
isa = PBXContainerItemProxy;
965+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
966+
proxyType = 2;
967+
remoteGlobalIDString = F0B950F11B0080BE00942C38;
968+
remoteInfo = "OCMock iOS";
969+
};
970+
81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */ = {
971+
isa = PBXContainerItemProxy;
972+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
973+
proxyType = 1;
974+
remoteGlobalIDString = F0B950F01B0080BE00942C38;
975+
remoteInfo = "OCMock iOS";
976+
};
977+
81AB68C71B7E7F2A0053210E /* PBXContainerItemProxy */ = {
978+
isa = PBXContainerItemProxy;
979+
containerPortal = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
980+
proxyType = 1;
981+
remoteGlobalIDString = 030EF0A714632FD000B04273;
982+
remoteInfo = OCMock;
983+
};
934984
F569F07E1B14DB3C00296F73 /* PBXContainerItemProxy */ = {
935985
isa = PBXContainerItemProxy;
936986
containerPortal = 09D33641139C54930098E916 /* Project object */;
@@ -941,14 +991,25 @@
941991
/* End PBXContainerItemProxy section */
942992

943993
/* Begin PBXCopyFilesBuildPhase section */
994+
81AB68CA1B7E7F830053210E /* Copy Frameworks */ = {
995+
isa = PBXCopyFilesBuildPhase;
996+
buildActionMask = 2147483647;
997+
dstPath = "";
998+
dstSubfolderSpec = 10;
999+
files = (
1000+
81AB68CB1B7E7F970053210E /* OCMock.framework in Copy Frameworks */,
1001+
);
1002+
name = "Copy Frameworks";
1003+
runOnlyForDeploymentPostprocessing = 0;
1004+
};
9441005
81C09F8C1AF9815F0043B49C /* Copy Frameworks */ = {
9451006
isa = PBXCopyFilesBuildPhase;
9461007
buildActionMask = 2147483647;
9471008
dstPath = "";
9481009
dstSubfolderSpec = 10;
9491010
files = (
1011+
81AB68C91B7E7F460053210E /* OCMock.framework in Copy Frameworks */,
9501012
81C09F8D1AF9816D0043B49C /* Bolts.framework in Copy Frameworks */,
951-
81AFA6771B0ECF97000763C0 /* OCMock.framework in Copy Frameworks */,
9521013
);
9531014
name = "Copy Frameworks";
9541015
runOnlyForDeploymentPostprocessing = 0;
@@ -1300,10 +1361,9 @@
13001361
81A245F11B1FB188006A6953 /* PFDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFDataProvider.h; sourceTree = "<group>"; };
13011362
81A715A21B423A4100A504FC /* PFObjectUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFObjectUtilities.h; sourceTree = "<group>"; };
13021363
81A715A31B423A4100A504FC /* PFObjectUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFObjectUtilities.m; sourceTree = "<group>"; };
1364+
81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OCMock.xcodeproj; path = Vendor/OCMock/Source/OCMock.xcodeproj; sourceTree = "<group>"; };
13031365
81ABC0FC1B5427EC00BA9009 /* PFUserController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFUserController.h; sourceTree = "<group>"; };
13041366
81ABC0FD1B5427EC00BA9009 /* PFUserController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFUserController.m; sourceTree = "<group>"; };
1305-
81AFA6701B0ECD4E000763C0 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
1306-
81AFA6751B0ECF90000763C0 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = ../Release/OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
13071367
81AFE0E51A1FDB7900AB6CB3 /* PFRESTUserCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFRESTUserCommand.h; sourceTree = "<group>"; };
13081368
81AFE0E61A1FDB7900AB6CB3 /* PFRESTUserCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFRESTUserCommand.m; sourceTree = "<group>"; };
13091369
81B3F2531AC9D4E100A92677 /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
@@ -1491,7 +1551,7 @@
14911551
isa = PBXFrameworksBuildPhase;
14921552
buildActionMask = 2147483647;
14931553
files = (
1494-
81AFA6711B0ECD4E000763C0 /* libOCMock.a in Frameworks */,
1554+
81AB68C01B7E7EE20053210E /* OCMock.framework in Frameworks */,
14951555
816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */,
14961556
F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */,
14971557
816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */,
@@ -1507,8 +1567,8 @@
15071567
isa = PBXFrameworksBuildPhase;
15081568
buildActionMask = 2147483647;
15091569
files = (
1570+
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */,
15101571
F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */,
1511-
81AFA6761B0ECF90000763C0 /* OCMock.framework in Frameworks */,
15121572
81C09F891AF97EA70043B49C /* ParseOSX.framework in Frameworks */,
15131573
815868E21AF9818D009A5751 /* Bolts.framework in Frameworks */,
15141574
F5B0B3161B44A22300F3EBC4 /* SystemConfiguration.framework in Frameworks */,
@@ -2532,6 +2592,18 @@
25322592
path = Utilities;
25332593
sourceTree = "<group>";
25342594
};
2595+
81AB68AF1B7E7ECC0053210E /* Products */ = {
2596+
isa = PBXGroup;
2597+
children = (
2598+
81AB68B71B7E7ECC0053210E /* OCMock.framework */,
2599+
81AB68B91B7E7ECC0053210E /* OCMockTests.xctest */,
2600+
81AB68BB1B7E7ECC0053210E /* libOCMock.a */,
2601+
81AB68BD1B7E7ECC0053210E /* OCMockLibTests.xctest */,
2602+
81AB68BF1B7E7ECC0053210E /* OCMock.framework */,
2603+
);
2604+
name = Products;
2605+
sourceTree = "<group>";
2606+
};
25352607
81ABC0FB1B5427DD00BA9009 /* Controller */ = {
25362608
isa = PBXGroup;
25372609
children = (
@@ -2544,8 +2616,7 @@
25442616
81AFA6781B0ECF9B000763C0 /* OCMock */ = {
25452617
isa = PBXGroup;
25462618
children = (
2547-
81AFA6751B0ECF90000763C0 /* OCMock.framework */,
2548-
81AFA6701B0ECD4E000763C0 /* libOCMock.a */,
2619+
81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */,
25492620
);
25502621
name = OCMock;
25512622
sourceTree = "<group>";
@@ -3475,10 +3546,12 @@
34753546
816F441E1A8E8933009CDB32 /* Sources */,
34763547
816F44711A8E8933009CDB32 /* Frameworks */,
34773548
816F447D1A8E8933009CDB32 /* Resources */,
3549+
81AB68CA1B7E7F830053210E /* Copy Frameworks */,
34783550
);
34793551
buildRules = (
34803552
);
34813553
dependencies = (
3554+
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */,
34823555
);
34833556
name = "ParseUnitTests-iOS";
34843557
productName = ParseTests;
@@ -3497,6 +3570,7 @@
34973570
buildRules = (
34983571
);
34993572
dependencies = (
3573+
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */,
35003574
);
35013575
name = "ParseUnitTests-OSX";
35023576
productName = ParseTests;
@@ -3573,6 +3647,12 @@
35733647
mainGroup = 09D3363F139C54930098E916;
35743648
productRefGroup = 09D3364B139C54940098E916 /* Products */;
35753649
projectDirPath = "";
3650+
projectReferences = (
3651+
{
3652+
ProductGroup = 81AB68AF1B7E7ECC0053210E /* Products */;
3653+
ProjectRef = 81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */;
3654+
},
3655+
);
35763656
projectRoot = "";
35773657
targets = (
35783658
81C3821B19CCA89E0066284A /* Parse-iOS */,
@@ -3585,6 +3665,44 @@
35853665
};
35863666
/* End PBXProject section */
35873667

3668+
/* Begin PBXReferenceProxy section */
3669+
81AB68B71B7E7ECC0053210E /* OCMock.framework */ = {
3670+
isa = PBXReferenceProxy;
3671+
fileType = wrapper.framework;
3672+
path = OCMock.framework;
3673+
remoteRef = 81AB68B61B7E7ECC0053210E /* PBXContainerItemProxy */;
3674+
sourceTree = BUILT_PRODUCTS_DIR;
3675+
};
3676+
81AB68B91B7E7ECC0053210E /* OCMockTests.xctest */ = {
3677+
isa = PBXReferenceProxy;
3678+
fileType = wrapper.cfbundle;
3679+
path = OCMockTests.xctest;
3680+
remoteRef = 81AB68B81B7E7ECC0053210E /* PBXContainerItemProxy */;
3681+
sourceTree = BUILT_PRODUCTS_DIR;
3682+
};
3683+
81AB68BB1B7E7ECC0053210E /* libOCMock.a */ = {
3684+
isa = PBXReferenceProxy;
3685+
fileType = archive.ar;
3686+
path = libOCMock.a;
3687+
remoteRef = 81AB68BA1B7E7ECC0053210E /* PBXContainerItemProxy */;
3688+
sourceTree = BUILT_PRODUCTS_DIR;
3689+
};
3690+
81AB68BD1B7E7ECC0053210E /* OCMockLibTests.xctest */ = {
3691+
isa = PBXReferenceProxy;
3692+
fileType = wrapper.cfbundle;
3693+
path = OCMockLibTests.xctest;
3694+
remoteRef = 81AB68BC1B7E7ECC0053210E /* PBXContainerItemProxy */;
3695+
sourceTree = BUILT_PRODUCTS_DIR;
3696+
};
3697+
81AB68BF1B7E7ECC0053210E /* OCMock.framework */ = {
3698+
isa = PBXReferenceProxy;
3699+
fileType = wrapper.framework;
3700+
path = OCMock.framework;
3701+
remoteRef = 81AB68BE1B7E7ECC0053210E /* PBXContainerItemProxy */;
3702+
sourceTree = BUILT_PRODUCTS_DIR;
3703+
};
3704+
/* End PBXReferenceProxy section */
3705+
35883706
/* Begin PBXResourcesBuildPhase section */
35893707
8139B12D1A7BF570002BEF84 /* Resources */ = {
35903708
isa = PBXResourcesBuildPhase;
@@ -4193,6 +4311,16 @@
41934311
target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;
41944312
targetProxy = 81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */;
41954313
};
4314+
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */ = {
4315+
isa = PBXTargetDependency;
4316+
name = "OCMock iOS";
4317+
targetProxy = 81AB68C11B7E7EEA0053210E /* PBXContainerItemProxy */;
4318+
};
4319+
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */ = {
4320+
isa = PBXTargetDependency;
4321+
name = OCMock;
4322+
targetProxy = 81AB68C71B7E7F2A0053210E /* PBXContainerItemProxy */;
4323+
};
41964324
F569F07F1B14DB3C00296F73 /* PBXTargetDependency */ = {
41974325
isa = PBXTargetDependency;
41984326
target = F569F07A1B14DB1E00296F73 /* BoltsSDK-iOS */;

0 commit comments

Comments
 (0)