Merge pull request #706 from ParsePlatform/nlutsenko.carthage.ocmock

nlutsenko · nlutsenko · commit 5eab93a76736 · 2015-12-31T11:50:29.000-08:00
Use OCMock checkout via Carthage.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "Vendor/OCMock"]
-	path = Vendor/OCMock
-	url = https://github.com/erikdoe/ocmock.git
 [submodule "Vendor/xctoolchain"]
 	path = Vendor/xctoolchain
 	url = https://github.com/ParsePlatform/xctoolchain.git
 [submodule "Carthage/Checkouts/Bolts-iOS"]
 	path = Carthage/Checkouts/Bolts-iOS
 	url = https://github.com/BoltsFramework/Bolts-iOS.git
+[submodule "Carthage/Checkouts/OCMock"]
+	path = Carthage/Checkouts/OCMock
+	url = https://github.com/erikdoe/OCMock.git
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1 @@
+github "erikdoe/OCMock" ~> 3.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1,2 @@
 github "BoltsFramework/Bolts-iOS" "1.5.1"
+github "erikdoe/OCMock" "v3.2"
diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock
@@ -0,0 +1 @@
+Subproject commit 9ba612d254394a2b4f98b56b9e1490ddb42fe855
diff --git a/Parse.xcodeproj/project.pbxproj b/Parse.xcodeproj/project.pbxproj
@@ -2120,7 +2120,7 @@
 		81A245F11B1FB188006A6953 /* PFDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFDataProvider.h; sourceTree = "<group>"; };
 		81A715A21B423A4100A504FC /* PFObjectUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFObjectUtilities.h; sourceTree = "<group>"; };
 		81A715A31B423A4100A504FC /* PFObjectUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFObjectUtilities.m; sourceTree = "<group>"; };
-		81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OCMock.xcodeproj; path = Vendor/OCMock/Source/OCMock.xcodeproj; sourceTree = "<group>"; };
+		81AB68AE1B7E7ECC0053210E /* OCMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OCMock.xcodeproj; path = Carthage/Checkouts/OCMock/Source/OCMock.xcodeproj; sourceTree = "<group>"; };
 		81ABC0FC1B5427EC00BA9009 /* PFUserController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFUserController.h; sourceTree = "<group>"; };
 		81ABC0FD1B5427EC00BA9009 /* PFUserController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFUserController.m; sourceTree = "<group>"; };
 		81AFE0E51A1FDB7900AB6CB3 /* PFRESTUserCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFRESTUserCommand.h; sourceTree = "<group>"; };
diff --git a/Parse.xcworkspace/contents.xcworkspacedata b/Parse.xcworkspace/contents.xcworkspacedata
diff --git a/Vendor/OCMock b/Vendor/OCMock

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`github "BoltsFramework/Bolts-iOS" "1.5.1"`
	`2`	`+github "erikdoe/OCMock" "v3.2"`