OSX stuff to swift 3.

tieusangaka · Sep 19, 2016 · 2549e06 · 2549e06
1 parent 6d90f97
commit 2549e06
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Neon.xcodeproj/project.pbxproj b/Neon.xcodeproj/project.pbxproj
@@ -327,6 +327,7 @@
 					};
 					03EDD3961BBF8A4F0006C4A9 = {
 						CreatedOnToolsVersion = 7.1;
+						LastSwiftMigration = 0800;
 					};
 					27D253651BAF71AB00FA4FED = {
 						CreatedOnToolsVersion = 7.0;
@@ -573,6 +574,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -600,6 +602,7 @@
 				PRODUCT_NAME = Neon;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

diff --git a/Source/NeonAlignable.swift b/Source/NeonAlignable.swift
@@ -39,7 +39,7 @@ public extension Alignable {
     /// match the specified `Align`. For example, if you specify `.ToTheRightMatchingTop` and provide an offset value of `5`, the
     /// view's y origin will be lower than the sibling view's y origin by 5 points.
     ///
-    public func align(align: Align, relativeTo sibling: Frameable, padding: CGFloat, width: CGFloat, height: CGFloat, offset: CGFloat = 0) {
+    public func align(_ align: Align, relativeTo sibling: Frameable, padding: CGFloat, width: CGFloat, height: CGFloat, offset: CGFloat = 0) {
         var xOrigin : CGFloat = 0.0
         var yOrigin : CGFloat = 0.0
 
@@ -97,11 +97,11 @@ public extension Alignable {
 
         if height == AutoHeight {
             self.setDimensionAutomatically()
-            self.align(align: align, relativeTo: sibling, padding: padding, width: width, height: self.height, offset: offset)
+            self.align(align, relativeTo: sibling, padding: padding, width: width, height: self.height, offset: offset)
         }
         if width == AutoWidth {
             self.setDimensionAutomatically()
-            self.align(align: align, relativeTo: sibling, padding: padding, width: self.width, height: height, offset: offset)
+            self.align(align, relativeTo: sibling, padding: padding, width: self.width, height: height, offset: offset)
         }
     }
 

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 = [.viewWidthSizable, .viewHeightSizable]
         #endif
     }
 }

diff --git a/Source/NeonGroupable.swift b/Source/NeonGroupable.swift
@@ -32,7 +32,7 @@ public extension Groupable {
     ///
     ///   - height: The height of each subview.
     ///
-    public func groupInCenter(_ group: Group, views: [Frameable], padding: CGFloat, width: CGFloat, height: CGFloat) {
+    public func groupInCenter(group: Group, views: [Frameable], padding: CGFloat, width: CGFloat, height: CGFloat) {
         if views.count == 0 {
             print("[NEON] Warning: No subviews provided to groupInCenter().")
             return