Merge pull request #52 from seedco/dm-swift-5

Migrate to Swift 5

Author: mckaskle

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build-and-test:
 
     macos:
-      xcode: 9.3.1
+      xcode: 11.1.0
 
     steps:
       - checkout

CHANGELOG.md

@@ -1,3 +1,4 @@
-# [Unreleased](https://github.com/seedco/StackViewController/compare/0.4.0...HEAD)
+# [0.5.0](https://github.com/seedco/StackViewController/compare/0.4.0...0.5.0)
 
+- Upgrade to Swift 5.0.
 - Fix runtime crashes (unrecognized selector) by adding `@objc` annotation to public UIKit extensions. 

Example/AppDelegate.swift

@@ -12,7 +12,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         self.window = {
             let window = UIWindow(frame: UIScreen.main.bounds)
             window.backgroundColor = .white

Example/ImageAttachmentView.swift

@@ -21,7 +21,7 @@ class ImageAttachmentView: UIView, ImageThumbnailViewDelegate {
 
     override init(frame: CGRect) {
         attachButton = UIButton(type: .custom)
-        attachButton.setBackgroundImage(UIImage(named: "attach-button")!, for: UIControlState())
+        attachButton.setBackgroundImage(UIImage(named: "attach-button")!, for: UIControl.State())
         attachButton.adjustsImageWhenHighlighted = true
 
         let stackView = UIStackView(frame: CGRect.zero)

Example/ImageAttachmentViewController.swift

@@ -38,10 +38,9 @@ class ImageAttachmentViewController: UIViewController, UIImagePickerControllerDe
     }
 
     // MARK: UIImagePickerControllerDelegate
-    
-    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
+    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
         dismiss(animated: true, completion: nil)
-        guard let imageURL = info[UIImagePickerControllerReferenceURL] as? URL else { return }
+        guard let imageURL = info[.referenceURL] as? URL else { return }
         getImageThumbnail(imageURL) { image in
             if let image = image {
                 self.attachmentView?.addImageWithThumbnail(image)

Example/ImageThumbnailView.swift

@@ -26,7 +26,7 @@ open class ImageThumbnailView: UIView {
         let deleteButtonImage = UIImage(named: "delete-button")!
         let deleteButton = UIButton(type: .custom)
         deleteButton.translatesAutoresizingMaskIntoConstraints = false
-        deleteButton.setBackgroundImage(deleteButtonImage, for: UIControlState())
+        deleteButton.setBackgroundImage(deleteButtonImage, for: UIControl.State())
         deleteButton.addTarget(self, action: #selector(ImageThumbnailView.didTapDelete(_:)), for: .touchUpInside)
 
         let imageView = UIImageView(image: thumbnail)

Example/LabeledTextField.swift

@@ -13,7 +13,7 @@ class LabeledTextField: UIView {
     fileprivate struct Appearance {
         static let LabelTextColor = UIColor(white: 0.56, alpha: 1.0)
         static let FieldTextColor = UIColor.black
-        static let Font = UIFont.preferredFont(forTextStyle: UIFontTextStyle.body)
+        static let Font = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.body)
     }
 
     fileprivate struct Layout {

Example/ViewController.swift

@@ -47,7 +47,7 @@ class ViewController: UIViewController {
         stackViewController.addItem(LabeledTextFieldController(labelText: "Subject:"))
 
         let textView = UITextView(frame: CGRect.zero)
-        textView.font = UIFont.preferredFont(forTextStyle: UIFontTextStyle.body)
+        textView.font = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.body)
         textView.isScrollEnabled = false
         textView.textContainerInset = UIEdgeInsets(top: 15, left: 10, bottom: 0, right: 10)
         textView.text = "This field automatically expands as you type, no additional logic required"
@@ -58,10 +58,10 @@ class ViewController: UIViewController {
     }
 
     fileprivate func displayStackViewController() {
-        addChildViewController(stackViewController)
+        addChild(stackViewController)
         view.addSubview(stackViewController.view)
         _ = stackViewController.view.activateSuperviewHuggingConstraints()
-        stackViewController.didMove(toParentViewController: self)
+        stackViewController.didMove(toParent: self)
     }
 
     override func viewDidAppear(_ animated: Bool) {

Makefile

@@ -1,5 +1,5 @@
 SDK="iphonesimulator"
-DESTINATION="platform=iOS Simulator,name=iPhone 6"
+DESTINATION="platform=iOS Simulator,name=iPhone 8"
 PROJECT="StackViewController"
 SCHEME="StackViewController"
 

SeedStackViewController.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = "SeedStackViewController"
   s.module_name = "StackViewController"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
   s.summary = "Simplifies the process of building forms and other static content using UIStackView."
   s.description = "StackViewController is a Swift framework that simplifies the process of building forms and other static content using UIStackView."
   s.homepage = "https://github.com/seedco/StackViewController"