Swift 4.1 updates

SwiftKickMobile · Apr 2, 2018 · 4e3c826 · 4e3c826
1 parent 0c27983
commit 4e3c826
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## 4.1.2
 
 ### Features
+* Updates for Swift 4.1
 * #164 Added an optional `windowViewController` property to `SwiftMessages.Config` for supplying a custom subclass of `WindowViewController`.
 
 ### Bug Fixes

diff --git a/SwiftMessages/Animator.swift b/SwiftMessages/Animator.swift
@@ -60,7 +60,7 @@ public class AnimationContext {
 
 public protocol Animator: class {
 
-    weak var delegate: AnimationDelegate? { get set }
+    var delegate: AnimationDelegate? { get set }
 
     func show(context: AnimationContext, completion: @escaping AnimationCompletion)
 

diff --git a/SwiftMessages/MessageView.swift b/SwiftMessages/MessageView.swift
@@ -95,7 +95,11 @@ open class MessageView: BaseView, Identifiable, AccessibleMessage {
     open var accessibilityPrefix: String?
 
     open var accessibilityMessage: String? {
+        #if swift(>=4.1)
+        let components = [accessibilityPrefix, titleLabel?.text, bodyLabel?.text].compactMap { $0 }
+        #else
         let components = [accessibilityPrefix, titleLabel?.text, bodyLabel?.text].flatMap { $0 }
+        #endif
         guard components.count > 0 else { return nil }
         return components.joined(separator: ", ")
     }

diff --git a/SwiftMessages/SwiftMessages.swift b/SwiftMessages/SwiftMessages.swift
@@ -776,7 +776,11 @@ extension SwiftMessages {
             }
         }
         let arrayOfViews = resolvedBundle.loadNibNamed(name, owner: filesOwner, options: nil) ?? []
+        #if swift(>=4.1)
+        guard let view = arrayOfViews.compactMap( { $0 as? T} ).first else { throw SwiftMessagesError.cannotLoadViewFromNib(nibName: name) }
+        #else
         guard let view = arrayOfViews.flatMap( { $0 as? T} ).first else { throw SwiftMessagesError.cannotLoadViewFromNib(nibName: name) }
+        #endif
         return view
     }
 }