Upgraded to Swift 5

unsignedapps · Apr 22, 2019 · ab6d0eb · ab6d0eb
1 parent 3782499
commit ab6d0eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Salon.xcodeproj/project.pbxproj b/Salon.xcodeproj/project.pbxproj
@@ -166,11 +166,11 @@
 				TargetAttributes = {
 					E89F76A62089C47E00E9C781 = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 0930;
+						LastSwiftMigration = 1020;
 					};
 					E89F76AF2089C47E00E9C781 = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 0930;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -180,6 +180,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = E89F769D2089C47E00E9C781;
 			productRefGroup = E89F76A82089C47E00E9C781 /* Products */;
@@ -384,7 +385,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -410,7 +411,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.unsignedapps.salon;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -431,7 +432,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.unsignedapps.SalonTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -451,7 +452,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.unsignedapps.SalonTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Salon/Conditions.swift b/Salon/Conditions.swift
@@ -149,7 +149,7 @@ extension ViewStyle.Condition where T: UIControl {
     ///
     /// - Returns: The new Condition.
     ///
-    public static func controlState (equals state: UIControlState) -> ViewStyle.Condition {
+    public static func controlState (equals state: UIControl.State) -> ViewStyle.Condition {
         return ViewStyle.Condition { $0.state == state }
     }
 }