Update to Swift 4.2

vadymmarkov · Nov 9, 2018 · bde0ebf · bde0ebf
1 parent e93c3d9
commit bde0ebf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "vadymmarkov/When" ~> 3.0
+github "vadymmarkov/When" ~> 4.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,3 @@
-github "Quick/Nimble" "v7.1.3"
-github "Quick/Quick" "v1.3.1"
-github "ReactiveX/RxSwift" "4.0.0-beta.0"
-github "vadymmarkov/When" "3.0.3"
+github "Quick/Nimble" "v7.3.1"
+github "Quick/Quick" "v1.3.2"
+github "vadymmarkov/When" "4.0.0"
diff --git a/Malibu.xcodeproj/project.pbxproj b/Malibu.xcodeproj/project.pbxproj
@@ -1313,6 +1313,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1346,6 +1347,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1538,6 +1540,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1562,6 +1565,7 @@
 				PRODUCT_NAME = Malibu;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1623,6 +1627,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1650,6 +1655,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "vadymmarkov/When" ~> 3.0
		github "vadymmarkov/When" ~> 4.0