Swift 5 (#23)

pedrommcarrasco · Mar 28, 2019 · 0d9984d · 0d9984d
1 parent 12826d1
commit 0d9984d
Show file tree

Hide file tree

Showing 34 changed files with 645 additions and 652 deletions.
diff --git a/Constrictor.podspec b/Constrictor.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
-  s.swift_version = "4.2"
+  s.swift_version = "5.0"
   s.name         = "Constrictor"
-  s.version      = "5.0.1"
+  s.version      = "6.0.0"
   s.summary      = "🐍 Constrict your layout in Swift"
 
   s.description  = "Constrict your Auto Layout code with Constrictor, your chainable sugar."

diff --git a/Constrictor/Constrictor.xcodeproj/project.pbxproj b/Constrictor/Constrictor.xcodeproj/project.pbxproj
@@ -517,7 +517,7 @@
 					};
 					53D8198620B57C0B00E62D1E = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 0930;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -526,7 +526,6 @@
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				en,
 			);
 			mainGroup = 53CDE3B420B3201E007E4AE0;
 			productRefGroup = 53CDE3BF20B3201E007E4AE0 /* Products */;
@@ -823,7 +822,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -851,7 +850,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -872,7 +871,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = pedrommcarrasco.ConstrictorTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -892,7 +891,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = pedrommcarrasco.ConstrictorTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Constrictor/Constrictor.xcodeproj/xcshareddata/xcschemes/Constrictor.xcscheme b/Constrictor/Constrictor.xcodeproj/xcshareddata/xcschemes/Constrictor.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Constrictor/Constrictor/Core/Constrictor+Simple.swift b/Constrictor/Constrictor/Core/Constrictor+Simple.swift
diff --git a/Constrictor/Constrictor/Modifiers/LayoutPriority.swift b/Constrictor/Constrictor/Modifiers/LayoutPriority.swift
@@ -40,11 +40,11 @@ extension LayoutPriority {
 // MARK: - Operators
 public extension LayoutPriority {
 
-    public static func +(lhs: LayoutPriority, rhs: Float) -> LayoutPriority {
+    static func +(lhs: LayoutPriority, rhs: Float) -> LayoutPriority {
         return LayoutPriority(lhs.value + rhs)
     }
 
-    public static func -(lhs: LayoutPriority, rhs: Float) -> LayoutPriority {
+    static func -(lhs: LayoutPriority, rhs: Float) -> LayoutPriority {
         return LayoutPriority(lhs.value - rhs)
     }
 }
diff --git a/Constrictor/Constrictor/Modifiers/LayoutState.swift b/Constrictor/Constrictor/Modifiers/LayoutState.swift
@@ -28,11 +28,11 @@ extension LayoutState {
 // MARK: - NSLayoutConstraint's Sugar
 public extension NSLayoutConstraint {
 
-    public func enable() {
+    func enable() {
         isActive = true
     }
 
-    public func disable() {
+    func disable() {
         isActive = false
     }
 }
diff --git a/Constrictor/Constrictor/Sugar/Center/CenterConstant.swift b/Constrictor/Constrictor/Sugar/Center/CenterConstant.swift
@@ -10,27 +10,27 @@ import UIKit
 
 // MARK: - CenterConstant
 public struct CenterConstant: Equatable {
-
+    
     let centerX: CGFloat
     let centerY: CGFloat
 }
 
 // MARK: - Modifiers
-extension CenterConstant {
-
-    public static func centerX(_ value: CGFloat) -> CenterConstant {
+public extension CenterConstant {
+    
+    static func centerX(_ value: CGFloat) -> CenterConstant {
         return CenterConstant(centerX: value, centerY: 0)
     }
-
-    public static func centerY(_ value: CGFloat) -> CenterConstant {
+    
+    static func centerY(_ value: CGFloat) -> CenterConstant {
         return CenterConstant(centerX: 0, centerY: value)
     }
 }
 
 // MARK: - Operator
-extension CenterConstant {
-
-    public static func & (lhs: CenterConstant, rhs: CenterConstant) -> CenterConstant {
+public extension CenterConstant {
+    
+    static func & (lhs: CenterConstant, rhs: CenterConstant) -> CenterConstant {
         return .init(centerX: lhs.centerX + rhs.centerX, centerY: lhs.centerY + rhs.centerY)
     }
 }
diff --git a/Constrictor/Constrictor/Sugar/Center/Constrictor+Center.swift b/Constrictor/Constrictor/Sugar/Center/Constrictor+Center.swift
@@ -9,10 +9,10 @@
 import UIKit
 
 // MARK: - Center
-extension Constrictor {
+public extension Constrictor {
 
     @discardableResult
-    public func center(as relation:  LayoutRelation = .equal,
+    func center(as relation:  LayoutRelation = .equal,
                        in item: Anchorable,
                        with constant: CenterConstant,
                        prioritizeAs priority: LayoutPriority = .required,
@@ -27,7 +27,7 @@ extension Constrictor {
     }
 
     @discardableResult
-    public func center(as relation:  LayoutRelation = .equal,
+    func center(as relation:  LayoutRelation = .equal,
                        in item: Anchorable,
                        with constant: CGFloat = 0,
                        prioritizeAs priority: LayoutPriority = .required,

diff --git a/Constrictor/Constrictor/Sugar/Edge/Constrictor+Edge.swift b/Constrictor/Constrictor/Sugar/Edge/Constrictor+Edge.swift
@@ -9,26 +9,26 @@
 import UIKit
 
 // MARK: - Edge
-extension Constrictor {
+public extension Constrictor {
 
     @discardableResult
-    public func edge(as relation:  LayoutRelation = .equal,
-                     to item: Anchorable,
-                     with constant: CGFloat,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func edge(as relation:  LayoutRelation = .equal,
+              to item: Anchorable,
+              with constant: CGFloat,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         edge(as: relation, to: item, with: .all(constant), prioritizeAs: priority, is: state)
 
         return self
     }
 
     @discardableResult
-    public func edge(as relation:  LayoutRelation = .equal,
-                     to item: Anchorable,
-                     with constant: EdgeConstant = .zero,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func edge(as relation:  LayoutRelation = .equal,
+              to item: Anchorable,
+              with constant: EdgeConstant = .zero,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         top(as: relation, to: item, .top, with: constant.top, prioritizeAs: priority, is: state)
         bottom(as: relation, to: item, .bottom, with: constant.bottom, prioritizeAs: priority, is: state)
@@ -39,12 +39,12 @@ extension Constrictor {
     }
 
     @discardableResult
-    public func edge(as relation:  LayoutRelation = .equal,
-                     to item: Anchorable,
-                     _ attributes: EdgeAnchor ...,
-                     with constant: CGFloat,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func edge(as relation:  LayoutRelation = .equal,
+              to item: Anchorable,
+              _ attributes: EdgeAnchor ...,
+              with constant: CGFloat,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         internalVariadicEdge(as: relation, to: item, attributes, with: .all(constant),
                              prioritizeAs: priority, is: state)
@@ -53,12 +53,12 @@ extension Constrictor {
     }
 
     @discardableResult
-    public func edge(as relation:  LayoutRelation = .equal,
-                     to item: Anchorable,
-                     _ attributes: EdgeAnchor ...,
-                     with constant: EdgeConstant = .zero,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func edge(as relation:  LayoutRelation = .equal,
+              to item: Anchorable,
+              _ attributes: EdgeAnchor ...,
+              with constant: EdgeConstant = .zero,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         internalVariadicEdge(as: relation, to: item, attributes, with: constant,
                              prioritizeAs: priority, is: state)

diff --git a/Constrictor/Constrictor/Sugar/Edge/EdgeConstant.swift b/Constrictor/Constrictor/Sugar/Edge/EdgeConstant.swift
@@ -18,33 +18,33 @@ public struct EdgeConstant: Equatable {
 }
 
 // MARK: - Modifiers
-extension EdgeConstant {
+public extension EdgeConstant {
 
-    public static var zero: EdgeConstant {
+    static var zero: EdgeConstant {
         return EdgeConstant(top: 0, bottom: 0, leading: 0, trailing: 0)
     }
 
-    public static func top(_ value: CGFloat) -> EdgeConstant {
+    static func top(_ value: CGFloat) -> EdgeConstant {
         return EdgeConstant(top: value, bottom: 0, leading: 0, trailing: 0)
     }
 
-    public static func bottom(_ value: CGFloat) -> EdgeConstant {
+    static func bottom(_ value: CGFloat) -> EdgeConstant {
         return EdgeConstant(top: 0, bottom: -value, leading: 0, trailing: 0)
     }
 
-    public static func leading(_ value: CGFloat) -> EdgeConstant {
+    static func leading(_ value: CGFloat) -> EdgeConstant {
         return EdgeConstant(top: 0, bottom: 0, leading: value, trailing: 0)
     }
 
-    public static func trailing(_ value: CGFloat) -> EdgeConstant {
+    static func trailing(_ value: CGFloat) -> EdgeConstant {
         return EdgeConstant(top: 0, bottom: 0, leading: 0, trailing: -value)
     }
 
-    public static func vertical(_ value: CGFloat) -> EdgeConstant {
+    static func vertical(_ value: CGFloat) -> EdgeConstant {
         return EdgeConstant(top: value, bottom: -value, leading: 0, trailing: 0)
     }
 
-    public static func horizontal(_ value: CGFloat) -> EdgeConstant {
+    static func horizontal(_ value: CGFloat) -> EdgeConstant {
         return EdgeConstant(top: 0, bottom: 0, leading: value, trailing: -value)
     }
 
@@ -54,9 +54,9 @@ extension EdgeConstant {
 }
 
 // MARK: - Operator
-extension EdgeConstant {
+public extension EdgeConstant {
 
-    public static func & (lhs: EdgeConstant, rhs: EdgeConstant) -> EdgeConstant {
+    static func & (lhs: EdgeConstant, rhs: EdgeConstant) -> EdgeConstant {
         return .init(top: lhs.top + rhs.top,
                      bottom: lhs.bottom + rhs.bottom,
                      leading: lhs.leading + rhs.leading,

diff --git a/Constrictor/Constrictor/Sugar/Size/Constrictor+Size.swift b/Constrictor/Constrictor/Sugar/Size/Constrictor+Size.swift
@@ -9,15 +9,15 @@
 import UIKit
 
 // MARK: - Size
-extension Constrictor {
+public extension Constrictor {
 
     @discardableResult
-    public func size(as relation: LayoutRelation = .equal,
-                     to item: Anchorable,
-                     with constant: SizeConstant,
-                     multiplyBy multiplier: CGFloat = 1,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func size(as relation: LayoutRelation = .equal,
+              to item: Anchorable,
+              with constant: SizeConstant,
+              multiplyBy multiplier: CGFloat = 1,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         width(as: relation, to: item, .width, with: constant.width,
               multiplyBy: multiplier, prioritizeAs: priority, is: state)
@@ -28,12 +28,12 @@ extension Constrictor {
     }
 
     @discardableResult
-    public func size(as relation: LayoutRelation = .equal,
-                     to item: Anchorable,
-                     with constant: CGFloat = 0,
-                     multiplyBy multiplier: CGFloat = 1,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func size(as relation: LayoutRelation = .equal,
+              to item: Anchorable,
+              with constant: CGFloat = 0,
+              multiplyBy multiplier: CGFloat = 1,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         width(as: relation, to: item, .width, with: constant,
               multiplyBy: multiplier, prioritizeAs: priority, is: state)
@@ -44,10 +44,10 @@ extension Constrictor {
     }
 
     @discardableResult
-    public func size(as relation: LayoutRelation = .equal,
-                     to constant: CGFloat,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func size(as relation: LayoutRelation = .equal,
+              to constant: CGFloat,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         width(as: relation, to: constant, prioritizeAs: priority, is: state)
         height(as: relation, to: constant, prioritizeAs: priority, is: state)
@@ -56,10 +56,10 @@ extension Constrictor {
     }
 
     @discardableResult
-    public func size(as relation: LayoutRelation = .equal,
-                     to constant: SizeConstant,
-                     prioritizeAs priority: LayoutPriority = .required,
-                     is state: LayoutState = .enabled) -> Self {
+    func size(as relation: LayoutRelation = .equal,
+              to constant: SizeConstant,
+              prioritizeAs priority: LayoutPriority = .required,
+              is state: LayoutState = .enabled) -> Self {
 
         width(as: relation, to: constant.width, prioritizeAs: priority, is: state)
         height(as: relation, to: constant.height, prioritizeAs: priority, is: state)