Merge branch 'swift4'

.travis.yml

@@ -1,12 +1,12 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode10
 
 env:
   global:
     - PROJECT=KGNAutoLayout
   matrix:
-    - DESTINATION="OS=11.0,name=iPhone 6s Plus" SCHEME=$PROJECT-iOS SDK=iphonesimulator TEST=test
-    - DESTINATION="OS=11.0,name=Apple TV 1080p" SCHEME=$PROJECT-tvOS SDK=appletvsimulator TEST=test
+    - DESTINATION="OS=12.0,name=iPhone 6s Plus" SCHEME=$PROJECT-iOS SDK=iphonesimulator TEST=test
+    - DESTINATION="OS=12.0,name=Apple TV 1080p" SCHEME=$PROJECT-tvOS SDK=appletvsimulator TEST=test
 
 script:
   - xcodebuild $TEST -project $PROJECT.xcodeproj -scheme $SCHEME -sdk $SDK -destination "$DESTINATION"

Example/AlbumViewController.swift

@@ -67,7 +67,7 @@ class AlbumViewController: UIViewController, UITableViewDataSource, UITableViewD
         let statusBarHeight = UIApplication.shared.statusBarFrame.height
         let tableView = UITableView(frame: CGRect.zero, style: .plain)
         tableView.register(TrackTableViewCell.self, forCellReuseIdentifier: TrackTableViewCell.identifier())
-        tableView.scrollIndicatorInsets = UIEdgeInsetsMake(statusBarHeight+self.navbarHeight, 0, 0, 0)
+        tableView.scrollIndicatorInsets = UIEdgeInsets.init(top: statusBarHeight+self.navbarHeight, left: 0, bottom: 0, right: 0)
         tableView.separatorColor = UIColor.white.withAlphaComponent(0.1)
         tableView.backgroundColor = .clear
         tableView.tableHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: screenWidth+statusBarHeight+self.navbarHeight))
@@ -122,7 +122,7 @@ class AlbumViewController: UIViewController, UITableViewDataSource, UITableViewD
         // Becuase we're making a totally custom "nav bar" handle the status bar frame change
         NotificationCenter.default.addObserver(
             self, selector: .statusBarFrameDidChange,
-            name: .UIApplicationDidChangeStatusBarFrame,
+            name: UIApplication.didChangeStatusBarFrameNotification,
             object: nil
         )
     }
@@ -134,9 +134,9 @@ class AlbumViewController: UIViewController, UITableViewDataSource, UITableViewD
     @objc func statusBarFrameDidChange(_ notification: Notification) {
         let screenWidth = UIScreen.main.bounds.width
         let statusBarHeight = UIApplication.shared.statusBarFrame.height
-        if let frame = (notification as NSNotification).userInfo?[UIApplicationStatusBarFrameUserInfoKey] as? CGRect {
+        if let frame = (notification as NSNotification).userInfo?[UIApplication.statusBarFrameUserInfoKey] as? CGRect {
             let height = frame.height
-            self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(height+self.navbarHeight, 0, 0, 0)
+            self.tableView.scrollIndicatorInsets = UIEdgeInsets.init(top: height+self.navbarHeight, left: 0, bottom: 0, right: 0)
             self.tableView.tableHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: screenWidth+statusBarHeight+self.navbarHeight))
         }
     }

Example/AppDelegate.swift

@@ -19,7 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return window
     }()
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         self.window?.rootViewController = PageViewController()
         self.window?.makeKeyAndVisible()
         return true

Example/PageViewController.swift

@@ -47,7 +47,7 @@ class PageViewController: UIViewController {
     }
 
     func addSubViewController(_ viewController: UIViewController, toView: UIView? = nil, belowSubview: UIView? = nil) {
-        self.addChildViewController(viewController)
+        self.addChild(viewController)
         var parentView = self.view
         if let view = toView {
             parentView = view
@@ -57,7 +57,7 @@ class PageViewController: UIViewController {
         } else {
             parentView?.addSubview(viewController.view)
         }
-        viewController.didMove(toParentViewController: self)
+        viewController.didMove(toParent: self)
         viewController.view.pinToEdgesOfSuperview()
     }
 

Example/ReadmeViewController.swift

@@ -82,7 +82,7 @@ class ReadmeViewController: UIViewController {
 
         var lastTitle: String!
         for snapshot in self.snapshots {
-            let values = snapshot.characters.split{$0 == "-"}.map(String.init)
+            let values = snapshot.split{$0 == "-"}.map(String.init)
             let title = values.first!.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
             let selector = values.last!.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
 

Example/SnapshotView.swift

@@ -33,7 +33,7 @@ class SnapshotView: UIView {
         UIGraphicsEndImageContext()
 
         let cachePath = "\(SnapshotView.cacheDirectory())/\(imageName).png"
-        let imageData = UIImagePNGRepresentation(image)
+        let imageData = image.pngData()
         _ = try? imageData?.write(to: URL(fileURLWithPath: cachePath), options: [])
 
         print("")

Example/SpringView.swift

@@ -20,9 +20,9 @@ class SpringView: UIView {
 
     override var intrinsicContentSize: CGSize {
         if direction == .horizontal {
-            return CGSize(width: UIViewNoIntrinsicMetric, height: 20)
+            return CGSize(width: UIView.noIntrinsicMetric, height: 20)
         } else {
-            return CGSize(width: 20, height: UIViewNoIntrinsicMetric)
+            return CGSize(width: 20, height: UIView.noIntrinsicMetric)
         }
     }
 

Example/TrackTableViewCell.swift

@@ -14,7 +14,7 @@ class TrackTableViewCell: UITableViewCell {
         return "\(self)"
     }
 
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
         self.backgroundColor = .clear

KGNAutoLayout.xcodeproj/project.pbxproj

@@ -452,12 +452,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "David Keegan";
 				TargetAttributes = {
 					64D31D151D2B0A0D009B93CA = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 					};
 					64D31D221D2B0A72009B93CA = {
 						CreatedOnToolsVersion = 7.3.1;
@@ -466,20 +466,20 @@
 					64EF095D1D3043D400274984 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeamName = "David Keegan";
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					83720E201BCB973700C8A14D = {
 						CreatedOnToolsVersion = 7.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 					};
 					83720E2A1BCB973700C8A14D = {
 						CreatedOnToolsVersion = 7.1;
 						LastSwiftMigration = 0900;
 					};
 					8376BBFD1BD6AA290084754D = {
 						CreatedOnToolsVersion = 7.0.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -684,7 +684,7 @@
 				PRODUCT_NAME = KGNAutoLayout;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -708,7 +708,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -757,7 +757,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -777,7 +777,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -910,7 +910,7 @@
 				PRODUCT_NAME = KGNAutoLayout;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -932,7 +932,7 @@
 				PRODUCT_NAME = KGNAutoLayout;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -970,7 +970,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.davidkeegan.KGNAutoLayoutExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -985,7 +985,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.davidkeegan.KGNAutoLayoutExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

KGNAutoLayout.xcodeproj/xcshareddata/xcschemes/KGNAutoLayout-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KGNAutoLayout.xcodeproj/xcshareddata/xcschemes/KGNAutoLayout-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KGNAutoLayout.xcodeproj/xcshareddata/xcschemes/KGNAutoLayoutExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KGNAutoLayout.xcodeproj/xcshareddata/xcschemes/KGNAutoLayoutReadme.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KGNAutoLayout.xcodeproj/xcshareddata/xcschemes/KGNAutoLayoutTests-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KGNAutoLayout.xcodeproj/xcshareddata/xcschemes/KGNAutoLayoutTests-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ReadmeExample/AppDelegate.swift

@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return window
     }()
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         self.window?.rootViewController = ReadmeViewController() // Generate readme examples
         self.window?.makeKeyAndVisible()
         return true

Source/KGNAutoLayout.swift

@@ -728,7 +728,7 @@ extension UIView {
     - Returns: The constraint object.
     */
     @discardableResult
-    public func constrain(item: LayoutItem, attribute itemAttribute: NSLayoutAttribute, toItem: LayoutItem? = nil, attribute toAttribute: NSLayoutAttribute = .notAnAttribute, relatedBy: NSLayoutRelation = .equal, multiplier: CGFloat = 1, offset: CGFloat = 0, priority: UILayoutPriority? = nil) -> NSLayoutConstraint {
+    public func constrain(item: LayoutItem, attribute itemAttribute: NSLayoutConstraint.Attribute, toItem: LayoutItem? = nil, attribute toAttribute: NSLayoutConstraint.Attribute = .notAnAttribute, relatedBy: NSLayoutConstraint.Relation = .equal, multiplier: CGFloat = 1, offset: CGFloat = 0, priority: UILayoutPriority? = nil) -> NSLayoutConstraint {
         if let view = item as? UIView {
             view.translatesAutoresizingMaskIntoConstraints = false
         }
@@ -906,11 +906,11 @@ extension Array where Element: UIView {
 // MARK: - Private
 extension UIView {
 
-    fileprivate func constrain(sizeAttribute: NSLayoutAttribute, size: CGFloat = 0, relatedBy: NSLayoutRelation = .equal, priority: UILayoutPriority? = nil) -> NSLayoutConstraint {
+    fileprivate func constrain(sizeAttribute: NSLayoutConstraint.Attribute, size: CGFloat = 0, relatedBy: NSLayoutConstraint.Relation = .equal, priority: UILayoutPriority? = nil) -> NSLayoutConstraint {
         return self.constrain(item: self, attribute: sizeAttribute, relatedBy: relatedBy, multiplier: 0, offset: size, priority: priority)
     }
 
-    fileprivate func constrain(edgeAttribute: NSLayoutAttribute, offset: CGFloat = 0, priority: UILayoutPriority? = nil) -> NSLayoutConstraint? {
+    fileprivate func constrain(edgeAttribute: NSLayoutConstraint.Attribute, offset: CGFloat = 0, priority: UILayoutPriority? = nil) -> NSLayoutConstraint? {
         assert(self.superview != nil, "Can't create constraints without a super view")
         guard let superview = self.superview else {
             return nil
@@ -919,7 +919,7 @@ extension UIView {
         return superview.constrain(item: self, attribute: edgeAttribute, toItem: superview, attribute: edgeAttribute, offset: offset, priority: priority)
     }
 
-    fileprivate func constrain(attribute: NSLayoutAttribute, toAttribute itemAttribute: NSLayoutAttribute, ofItem item: LayoutItem, relatedBy: NSLayoutRelation = .equal, multiplier: CGFloat = 1, offset: CGFloat = 0, priority: UILayoutPriority? = nil) -> NSLayoutConstraint? {
+    fileprivate func constrain(attribute: NSLayoutConstraint.Attribute, toAttribute itemAttribute: NSLayoutConstraint.Attribute, ofItem item: LayoutItem, relatedBy: NSLayoutConstraint.Relation = .equal, multiplier: CGFloat = 1, offset: CGFloat = 0, priority: UILayoutPriority? = nil) -> NSLayoutConstraint? {
         let commonSuperview: UIView? = {
             guard let view = item as? UIView else {
                 return self.superview