Merge pull request #25 from JanGorman/swift/4.2

Swift/4.2
JanGorman · Sep 20, 2018 · 9d3a8ca · 9d3a8ca
2 parents affc1ad + 33f5c14
commit 9d3a8ca
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 23 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/Example/SwiftMessageBarExample/SwiftMessageBarExample.xcodeproj/project.pbxproj b/Example/SwiftMessageBarExample/SwiftMessageBarExample.xcodeproj/project.pbxproj
@@ -134,7 +134,7 @@
 				TargetAttributes = {
 					F2AB59081B28B3B3001DCC74 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 					};
 				};
 			};
@@ -339,8 +339,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -353,8 +352,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/SwiftMessageBar.podspec b/SwiftMessageBar.podspec
@@ -1,8 +1,9 @@
 Pod::Spec.new do |s|
 
-  s.name         = "SwiftMessageBar"
-  s.version      = "5.2.2"
-  s.summary      = "A Swift Message Bar"
+  s.name          = "SwiftMessageBar"
+  s.version       = "5.3.0"
+  s.summary       = "A Swift Message Bar"
+  s.swift_version = '4.2'
 
   s.description  = <<-DESC
                    A longer description of SwiftMessageBar in Markdown format.

diff --git a/SwiftMessageBar.xcodeproj/project.pbxproj b/SwiftMessageBar.xcodeproj/project.pbxproj
@@ -149,7 +149,7 @@
 				TargetAttributes = {
 					F2AB58E11B28B33C001DCC74 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -335,8 +335,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -356,8 +355,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/SwiftMessageBar/Message.swift b/SwiftMessageBar/Message.swift
@@ -108,10 +108,10 @@ final class Message: UIView {
     }
 
     addConstraint(NSLayoutConstraint(item: iconImageView,
-                                     attribute: NSLayoutAttribute.centerY,
-                                     relatedBy: NSLayoutRelation.equal,
+                                     attribute: .centerY,
+                                     relatedBy: .equal,
                                      toItem: iconImageView.superview,
-                                     attribute: NSLayoutAttribute.centerY,
+                                     attribute: .centerY,
                                      multiplier: 1.0,
                                      constant: (topMargin - bottomMargin) / 2.0))
   }
@@ -131,7 +131,7 @@ final class Message: UIView {
     addSubview(titleLabel)
 
     if let title = title {
-      let attributes: [NSAttributedStringKey: Any] = [
+      let attributes: [NSAttributedString.Key: Any] = [
         .font : titleFont,
         .foregroundColor: titleFontColor,
         .paragraphStyle: paragraphStyle
@@ -148,7 +148,7 @@ final class Message: UIView {
     addSubview(messageLabel)
 
     if let message = message {
-      let attributes: [NSAttributedStringKey: Any] = [
+      let attributes: [NSAttributedString.Key: Any] = [
         .font : messageFont,
         .foregroundColor: messageFontColor,
         .paragraphStyle: paragraphStyle
@@ -180,7 +180,7 @@ final class Message: UIView {
 
   var titleSize: CGSize {
     let boundedSize = CGSize(width: availableWidth, height: CGFloat.greatestFiniteMagnitude)
-    let titleFontAttributes: [NSAttributedStringKey: Any] = [.font: titleFont]
+    let titleFontAttributes: [NSAttributedString.Key: Any] = [.font: titleFont]
     if let size = title?.boundingRect(with: boundedSize,
                                       options: [.truncatesLastVisibleLine, .usesLineFragmentOrigin],
                                       attributes: titleFontAttributes, context: nil).size {
@@ -191,7 +191,7 @@ final class Message: UIView {
 
   var messageSize: CGSize {
     let boundedSize = CGSize(width: availableWidth, height: CGFloat.greatestFiniteMagnitude)
-    let titleFontAttributes: [NSAttributedStringKey: Any] = [.font: messageFont]
+    let titleFontAttributes: [NSAttributedString.Key: Any] = [.font: messageFont]
     if let size = message?.boundingRect(with: boundedSize,
                                         options: [.truncatesLastVisibleLine, .usesLineFragmentOrigin],
                                         attributes: titleFontAttributes, context: nil).size {

diff --git a/SwiftMessageBar/SwiftMessageBar.swift b/SwiftMessageBar/SwiftMessageBar.swift
@@ -171,7 +171,7 @@ public final class SwiftMessageBar {
     let messageWindow = MessageWindow()
     messageWindow.frame = UIScreen.main.bounds
     messageWindow.isHidden = false
-    messageWindow.windowLevel = UIWindowLevelNormal
+    messageWindow.windowLevel = .normal
     messageWindow.backgroundColor = .clear
     messageWindow.messageBarController.statusBarHidden = config.isStatusBarHidden
     messageWindow.rootViewController = messageWindow.messageBarController
@@ -289,7 +289,7 @@ public final class SwiftMessageBar {
     }
 
     messageWindow.messageBarView.addSubview(message)
-    messageWindow.messageBarView.bringSubview(toFront: message)
+    messageWindow.messageBarView.bringSubviewToFront(message)
     isMessageVisible = true
     message.configureSubviews()
     message.frame = CGRect(x: 0, y: -message.estimatedHeight, width: message.width, height: message.estimatedHeight)