Merge remote-tracking branch 'origin/master' into upgrade-dependencies

jspahrsummers · jspahrsummers · commit 39ac48d50e9b · 2015-03-01T11:11:35.000-08:00
diff --git a/Cartfile b/Cartfile
@@ -1,5 +1,2 @@
 github "ReactiveCocoa/ReactiveCocoa" "swift-development"
-github "Quick/Quick" ~> 0.2
-github "Quick/Nimble" ~> 0.3
 github "LlamaKit/LlamaKit" == 0.5
-github "jspahrsummers/xcconfigs" >= 0.6
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1,3 @@
+github "Quick/Quick" ~> 0.2
+github "Quick/Nimble" ~> 0.3
+github "jspahrsummers/xcconfigs" >= 0.6
diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj
@@ -350,6 +350,7 @@
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -361,6 +362,7 @@
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -422,6 +424,7 @@
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -458,6 +461,7 @@
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+github "Quick/Quick" ~> 0.2`
	`2`	`+github "Quick/Nimble" ~> 0.3`
	`3`	`+github "jspahrsummers/xcconfigs" >= 0.6`