Update to Swift 5

Author: JanGorman

Example/SwiftMessageBarExample/SwiftMessageBarExample.xcodeproj/project.pbxproj

@@ -129,18 +129,18 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Schnaub;
 				TargetAttributes = {
 					F2AB59081B28B3B3001DCC74 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = "";
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = F2AB59041B28B3B3001DCC74 /* Build configuration list for PBXProject "SwiftMessageBarExample" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -229,6 +229,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -285,6 +286,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -339,7 +341,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -352,7 +354,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

SwiftMessageBar.podspec

@@ -1,9 +1,9 @@
 Pod::Spec.new do |s|
 
   s.name          = 'SwiftMessageBar'
-  s.version       = '5.4.2'
+  s.version       = '5.5.0'
   s.summary       = 'A Swift Message Bar'
-  s.swift_version = '4.2'
+  s.swift_version = '5.0'
 
   s.description  = <<-DESC
                    A longer description of SwiftMessageBar in Markdown format.
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.authors            = { 'Jan Gorman' => 'https://github.com/JanGorman/', 'Ramy Kfoury' => 'https://github.com/ramy-kfoury/' }
   s.social_media_url   = 'http://twitter.com/JanGorman'
 
-  s.platform     = :ios, '9.0'
+  s.platform     = :ios, '10.0'
 
   s.source       = { :git => 'https://github.com/JanGorman/SwiftMessageBar.git', :tag => s.version }
 

SwiftMessageBar.xcodeproj/project.pbxproj

@@ -144,21 +144,22 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Schnaub;
 				TargetAttributes = {
 					F2AB58E11B28B33C001DCC74 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = F2AB58DC1B28B33C001DCC74 /* Build configuration list for PBXProject "SwiftMessageBar" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = F2AB58D81B28B33C001DCC74;
 			productRefGroup = F2AB58E31B28B33C001DCC74 /* Products */;
@@ -209,6 +210,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -269,6 +271,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -335,7 +338,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -355,7 +358,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

SwiftMessageBar.xcodeproj/xcshareddata/xcschemes/SwiftMessageBar.xcscheme

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

SwiftMessageBar/Message.swift

@@ -116,8 +116,8 @@ final class Message: UIView {
 
     if let title = title {
       let attributes: [NSAttributedString.Key: Any] = [
-        .font : titleFont,
-        .foregroundColor: titleFontColor,
+        .font : titleFont!,
+        .foregroundColor: titleFontColor!,
         .paragraphStyle: paragraphStyle
       ]
       titleLabel.attributedText = NSAttributedString(string: title, attributes: attributes)
@@ -131,8 +131,8 @@ final class Message: UIView {
 
     if let message = message {
       let attributes: [NSAttributedString.Key: Any] = [
-        .font : messageFont,
-        .foregroundColor: messageFontColor,
+        .font : messageFont!,
+        .foregroundColor: messageFontColor!,
         .paragraphStyle: paragraphStyle
       ]
       messageLabel.attributedText = NSAttributedString(string: message, attributes: attributes)

SwiftMessageBar/Queue.swift

@@ -38,10 +38,10 @@ struct Queue<T: Equatable> {
   }
 
   mutating func removeElement(_ element: T) {
-    if let idx = left.index(of: element) {
+    if let idx = left.firstIndex(of: element) {
       left.remove(at: idx)
     }
-    if let idx = right.index(of: element) {
+    if let idx = right.firstIndex(of: element) {
       right.remove(at: idx)
     }
   }