Added support for swift 5

.swift-version

@@ -1 +1 @@
-4.1
+5.0

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode10.2
 script: sh build.sh /tmp/LayoutKit
 after_success:
   - bash <(curl -s https://codecov.io/bash) -D /tmp/LayoutKit

LayoutKit.playground/Pages/TextView.xcplaygroundpage/Contents.swift

@@ -8,10 +8,10 @@ rootView.backgroundColor = .white
 let textString = "Hello World\nHello World\nHello World\nHello World\nHello World\n"
 let attributedString1 = NSMutableAttributedString(
     string: textString,
-    attributes: [NSAttributedStringKey.font: UIFont.systemFont(ofSize: 15)])
+    attributes: [NSAttributedString.Key.font: UIFont.systemFont(ofSize: 15)])
 let attributedString2 = NSMutableAttributedString(
     string: textString,
-    attributes: [NSAttributedStringKey.font: UIFont.systemFont(ofSize: 12)])
+    attributes: [NSAttributedString.Key.font: UIFont.systemFont(ofSize: 12)])
 attributedString1.append(attributedString2)
 let attributedText = Text.attributed(attributedString1)
 

LayoutKit.xcodeproj/project.pbxproj

@@ -1160,16 +1160,17 @@
 				TargetAttributes = {
 					0B2D09AF1D8735E1007E487C = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					0BCB755E1D8720110065E02A = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					0BCB75671D8720110065E02A = {
 						CreatedOnToolsVersion = 8.0;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					0BCB757B1D8721370065E02A = {
@@ -1190,18 +1191,21 @@
 					};
 					0BCB75B51D8723B30065E02A = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					7EEA2AB5201D18F20077A088 = {
 						CreatedOnToolsVersion = 9.2;
 						ProvisioningStyle = Automatic;
 					};
+					7EECD00E2053916C003DC4B1 = {
+						LastSwiftMigration = 1020;
+					};
 				};
 			};
 			buildConfigurationList = 0BCB75571D871FC40065E02A /* Build configuration list for PBXProject "LayoutKit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -1730,6 +1734,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1777,6 +1782,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1812,7 +1818,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SWIFT_VERSION = 4.1;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1845,7 +1851,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.1;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

LayoutKitSampleApp/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UINavigationController(rootViewController: MenuViewController())
         window?.makeKeyAndVisible()

LayoutKitSampleApp/Benchmarks/TableViewController.swift

@@ -28,7 +28,7 @@ class TableViewController<ContentViewType: UIView>: UITableViewController where
 
     init(data: [CellType.DataType]) {
         self.data = data
-        super.init(style: UITableViewStyle.grouped)
+        super.init(style: UITableView.Style.grouped)
     }
 
     required init?(coder aDecoder: NSCoder) {
@@ -52,7 +52,7 @@ class TableViewController<ContentViewType: UIView>: UITableViewController where
     }
 
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return UITableViewAutomaticDimension
+        return UITableView.automaticDimension
     }
 }
 

LayoutKitTests/LabelLayoutTests.swift

@@ -52,7 +52,7 @@ class LabelLayoutTests: XCTestCase {
     }
 
     func testAttributedLabel() {
-        let attributedText = NSAttributedString(string: "Hi", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)])
+        let attributedText = NSAttributedString(string: "Hi", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)])
         let font = UIFont.helvetica(size: 99)
 
         let arrangement = LabelLayout(attributedText: attributedText, font: font).arrangement()
@@ -122,7 +122,7 @@ class LabelLayoutTests: XCTestCase {
     func testAttributedTextCustomFont() {
         #if !os(tvOS) // tvOS doesn't currently support custom fonts
         let font = UIFont(name: "Papyrus", size: 20)!
-        let attributes = [NSAttributedStringKey.font: font]
+        let attributes = [NSAttributedString.Key.font: font]
         let text = NSAttributedString(string: "Hello! 😄😄😄", attributes: attributes)
 
         let arrangement = LabelLayout(attributedText: text).arrangement()
@@ -136,7 +136,7 @@ class LabelLayoutTests: XCTestCase {
         #if !os(tvOS) // tvOS doesn't currently support custom fonts
         let font = UIFont(name: "Papyrus", size: 20)!
         let text = NSMutableAttributedString(string: "Hello world! 😄😄😄")
-        text.addAttribute(NSAttributedStringKey.font, value: font, range: NSMakeRange(6, 6))
+        text.addAttribute(NSAttributedString.Key.font, value: font, range: NSMakeRange(6, 6))
 
         let arrangement = LabelLayout(attributedText: text).arrangement()
         let label = UILabel(attributedText: text)

LayoutKitTests/ReloadableViewLayoutAdapterCollectionViewTests.swift

@@ -110,11 +110,11 @@ private class TestCollectionView: LayoutAdapterCollectionView, TestableReloadabl
     }
 
     fileprivate func verifyHeader(_ section: Int, text: String?, frame: CGRect?, file: StaticString, line: UInt) {
-        verifySupplementaryView(UICollectionElementKindSectionHeader, section: section, text: text, frame: frame, file: file, line: line)
+        verifySupplementaryView(UICollectionView.elementKindSectionHeader, section: section, text: text, frame: frame, file: file, line: line)
     }
 
     fileprivate func verifyFooter(_ section: Int, text: String?, frame: CGRect?, file: StaticString, line: UInt) {
-        verifySupplementaryView(UICollectionElementKindSectionFooter, section: section, text: text, frame: frame, file: file, line: line)
+        verifySupplementaryView(UICollectionView.elementKindSectionFooter, section: section, text: text, frame: frame, file: file, line: line)
     }
 
     private func verifySupplementaryView(_ kind: String, section: Int, text: String?, frame: CGRect?, file: StaticString, line: UInt) {

LayoutKitTests/ReloadableViewLayoutAdapterTableViewTests.swift

@@ -68,17 +68,17 @@ private class TestTableView: LayoutAdapterTableView, TestableReloadableView {
         reloadDataCount += 1
     }
 
-    fileprivate override func insertRows(at indexPaths: [IndexPath], with animation: UITableViewRowAnimation) {
+    fileprivate override func insertRows(at indexPaths: [IndexPath], with animation: UITableView.RowAnimation) {
         super.insertRows(at: indexPaths, with: animation)
         batchUpdates.insertItems.append(contentsOf: indexPaths)
     }
 
-    fileprivate override func deleteRows(at indexPaths: [IndexPath], with animation: UITableViewRowAnimation) {
+    fileprivate override func deleteRows(at indexPaths: [IndexPath], with animation: UITableView.RowAnimation) {
         super.deleteRows(at: indexPaths, with: animation)
         batchUpdates.deleteItems.append(contentsOf: indexPaths)
     }
 
-    fileprivate override func reloadRows(at indexPaths: [IndexPath], with animation: UITableViewRowAnimation) {
+    fileprivate override func reloadRows(at indexPaths: [IndexPath], with animation: UITableView.RowAnimation) {
         super.reloadRows(at: indexPaths, with: animation)
         batchUpdates.reloadItems.append(contentsOf: indexPaths)
     }
@@ -88,17 +88,17 @@ private class TestTableView: LayoutAdapterTableView, TestableReloadableView {
         batchUpdates.moveItems.append(ItemMove(from: indexPath, to: newIndexPath))
     }
 
-    fileprivate override func insertSections(_ sections: IndexSet, with animation: UITableViewRowAnimation) {
+    fileprivate override func insertSections(_ sections: IndexSet, with animation: UITableView.RowAnimation) {
         super.insertSections(sections, with: animation)
         batchUpdates.insertSections.formUnion(sections)
     }
 
-    fileprivate override func reloadSections(_ sections: IndexSet, with animation: UITableViewRowAnimation) {
+    fileprivate override func reloadSections(_ sections: IndexSet, with animation: UITableView.RowAnimation) {
         super.reloadSections(sections, with: animation)
         batchUpdates.reloadSections.formUnion(sections)
     }
 
-    fileprivate override func deleteSections(_ sections: IndexSet, with animation: UITableViewRowAnimation) {
+    fileprivate override func deleteSections(_ sections: IndexSet, with animation: UITableView.RowAnimation) {
         super.deleteSections(sections, with: animation)
         batchUpdates.deleteSections.formUnion(sections)
     }

LayoutKitTests/TextExtension.swift

@@ -30,12 +30,12 @@ extension Text {
             .unattributed("Hello! 😄😄😄"),
             .attributed(NSAttributedString(string: "")),
             .attributed(NSAttributedString(string: " ")),
-            .attributed(NSAttributedString(string: "", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)])),
-            .attributed(NSAttributedString(string: " ", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)])),
+            .attributed(NSAttributedString(string: "", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)])),
+            .attributed(NSAttributedString(string: " ", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)])),
             .attributed(NSAttributedString(string: "Hi")),
             .attributed(NSAttributedString(string: "Hello world")),
             .attributed(NSAttributedString(string: "Hello! 😄😄😄")),
-            .attributed(NSAttributedString(string: "Hello! 😄😄😄", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)])),
+            .attributed(NSAttributedString(string: "Hello! 😄😄😄", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)])),
             ]
 
         let fontSizes = 0...20

LayoutKitTests/TextViewLayoutTests.swift

@@ -67,10 +67,10 @@ class TextViewLayoutTests: XCTestCase {
         let textString = "Hello World\nHello World\nHello World\nHello World\nHello World"
         let attributedString1 = NSMutableAttributedString(
             string: textString,
-            attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 15)])
+            attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 15)])
         let attributedString2 = NSMutableAttributedString(
             string: textString,
-            attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 12)])
+            attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 12)])
         attributedString1.append(attributedString2)
         let attributedText = Text.attributed(attributedString1)
 

Sources/ConfigurableLayout.swift

@@ -42,7 +42,7 @@ public protocol ConfigurableLayout: Layout {
 
 // Implement `configure(baseViewType:)` from `Layout`.
 public extension ConfigurableLayout {
-    public func configure(baseTypeView: View) {
+    func configure(baseTypeView: View) {
         guard let view = baseTypeView as? ConfigurableView else {
             assertionFailure("Expected baseTypeView \(baseTypeView) to be of type \(ConfigurableView.self) but it was of type \(type(of: baseTypeView))")
             return

Sources/Internal/NSAttributedStringExtension.swift

@@ -12,7 +12,7 @@ extension NSAttributedString {
 
     /// Returns a new NSAttributedString with a given font and the same attributes.
     func with(font: UIFont) -> NSAttributedString {
-        let fontAttribute = [NSAttributedStringKey.font: font]
+        let fontAttribute = [NSAttributedString.Key.font: font]
         let attributedTextWithFont = NSMutableAttributedString(string: string, attributes: fontAttribute)
         let fullRange = NSMakeRange(0, (string as NSString).length)
         attributedTextWithFont.beginEditing()

Sources/Layouts/ButtonLayout.swift

@@ -292,7 +292,7 @@ public enum ButtonLayoutType {
     case infoDark
     case contactAdd
 
-    public var buttonType: UIButtonType {
+    public var buttonType: UIButton.ButtonType {
         switch (self) {
         case .custom:
             return .custom

Sources/Layouts/TextViewLayout.swift

@@ -233,7 +233,7 @@ private extension Text {
         case .attributed(_):
             let text = Text.attributed(NSAttributedString(
                 string: spaceString,
-                attributes: [NSAttributedStringKey.font: font]))
+                attributes: [NSAttributedString.Key.font: font]))
             size = text.textSize(within: maxSize, font: font)
 
         case .unattributed(_):

Sources/ObjCSupport/Builders/LOKButtonLayoutBuilder.h

@@ -10,7 +10,7 @@
 
 @class LOKButtonLayout;
 
-typedef NS_ENUM(NSInteger, LOKButtonLayoutType) {
+typedef NS_CLOSED_ENUM(NSInteger, LOKButtonLayoutType) {
     LOKButtonLayoutTypeCustom,
     LOKButtonLayoutTypeSystem,
     LOKButtonLayoutTypeDetailDisclosure,

Sources/ObjCSupport/Builders/LOKStackLayoutBuilder.h

@@ -8,7 +8,7 @@
 
 #import "LOKLayoutBuilder.h"
 
-typedef NS_ENUM(NSInteger, LOKStackLayoutDistribution) {
+typedef NS_CLOSED_ENUM(NSInteger, LOKStackLayoutDistribution) {
     LOKStackLayoutDistributionDefault,
     LOKStackLayoutDistributionLeading,
     LOKStackLayoutDistributionTrailing,
@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, LOKStackLayoutDistribution) {
     LOKStackLayoutDistributionFillFlexing
 };
 
-typedef NS_ENUM(NSInteger, LOKAxis) {
+typedef NS_CLOSED_ENUM(NSInteger, LOKAxis) {
     LOKAxisVertical,
     LOKAxisHorizontal
 };

Sources/Text.swift

@@ -39,7 +39,7 @@ public enum Text {
             if text.isEmpty {
                 return .zero
             }
-            size = text.boundingRect(with: maxSize, options: options, attributes: [NSAttributedStringKey.font: font], context: nil).size
+            size = text.boundingRect(with: maxSize, options: options, attributes: [NSAttributedString.Key.font: font], context: nil).size
         }
         // boundingRect(with:options:attributes:) returns size to a precision of hundredths of a point,
         // but UILabel only returns sizes with a point precision of 1/screenDensity.

Sources/UIKitSupport.swift

@@ -39,6 +39,8 @@ extension UIView {
                     return .leftToRight
                 case .rightToLeft:
                     return .rightToLeft
+                @unknown default:
+                    return .leftToRight
                 }
             } else {
                 #if LAYOUTKIT_EXTENSION_DEFAULT_RIGHT_TO_LEFT

Sources/Views/ReloadableView.swift

@@ -60,8 +60,8 @@ extension UICollectionView: ReloadableView {
     @objc
     open func registerViews(withReuseIdentifier reuseIdentifier: String) {
         register(UICollectionViewCell.self, forCellWithReuseIdentifier: reuseIdentifier)
-        register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: reuseIdentifier)
-        register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionFooter, withReuseIdentifier: reuseIdentifier)
+        register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: reuseIdentifier)
+        register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: reuseIdentifier)
     }
 
     @objc

Sources/Views/ReloadableViewLayoutAdapter+UICollectionView.swift

@@ -55,9 +55,9 @@ extension ReloadableViewLayoutAdapter: UICollectionViewDataSource {
         let view = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: reuseIdentifier, for: indexPath)
         let arrangement: LayoutArrangement?
         switch kind {
-        case UICollectionElementKindSectionHeader:
+        case UICollectionView.elementKindSectionHeader:
             arrangement = currentArrangement[indexPath.section].header
-        case UICollectionElementKindSectionFooter:
+        case UICollectionView.elementKindSectionFooter:
             arrangement = currentArrangement[indexPath.section].footer
         default:
             arrangement = nil

Sources/Views/StackView.swift

@@ -154,7 +154,7 @@ private struct ViewLayout: ConfigurableLayout {
         return Flexibility(horizontal: horizontal, vertical: vertical)
     }
 
-    private func flexForAxis(_ axis: UILayoutConstraintAxis) -> Flexibility.Flex {
+    private func flexForAxis(_ axis: NSLayoutConstraint.Axis) -> Flexibility.Flex {
         switch view.contentHuggingPriority(for: .horizontal) {
         case UILayoutPriority.required:
             return nil