Migrating to Swift 4

mamaral · Nov 2, 2017 · 2e59f5d · 2e59f5d
1 parent 6181a75
commit 2e59f5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Neon.xcodeproj/project.pbxproj b/Neon.xcodeproj/project.pbxproj
@@ -324,7 +324,7 @@
 					};
 					03EDD3821BBF89910006C4A9 = {
 						CreatedOnToolsVersion = 7.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					03EDD3961BBF8A4F0006C4A9 = {
 						CreatedOnToolsVersion = 7.1;
@@ -519,7 +519,8 @@
 				PRODUCT_NAME = Neon;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -548,7 +549,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.MikeAmaral.NeoniOS;
 				PRODUCT_NAME = Neon;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -577,7 +579,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -605,7 +607,7 @@
 				PRODUCT_NAME = Neon;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

diff --git a/Source/NeonExtensions.swift b/Source/NeonExtensions.swift
@@ -30,7 +30,7 @@ extension View : Frameable, Anchorable, Alignable, Groupable {
             self.sizeToFit()
         #else
             self.autoresizesSubviews = true
-            self.autoresizingMask = [.viewWidthSizable, .viewHeightSizable]
+            self.autoresizingMask = [.width, .height]
         #endif
     }
 }