Swift 4.2 migration

Author: pmusolino

Customerly.xcodeproj/project.pbxproj

@@ -652,7 +652,7 @@
 				TargetAttributes = {
 					455CE12E1DE0AABD00FF65DC = {
 						CreatedOnToolsVersion = 8.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					455CE1371DE0AABD00FF65DC = {
@@ -662,10 +662,12 @@
 					455CE14A1DE0AAF200FF65DC = {
 						CreatedOnToolsVersion = 8.1;
 						DevelopmentTeam = BVJ7983QHC;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					455CE15D1DE0AAF200FF65DC = {
 						CreatedOnToolsVersion = 8.1;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 455CE14A1DE0AAF200FF65DC;
 					};
@@ -1088,7 +1090,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1146,7 +1148,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1311,7 +1313,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1362,7 +1364,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1419,7 +1421,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_TARGET_NAME = CustomerlyDemo;
 			};
 			name = Debug;
@@ -1467,7 +1469,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_TARGET_NAME = CustomerlyDemo;
 				VALIDATE_PRODUCT = YES;
 			};

Customerly.xcworkspace/xcuserdata/pmusolino.xcuserdatad/UserInterfaceState.xcuserstate

@@ -14,7 +14,7 @@ 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 {
         // Override point for customization after application launch.
 
         Customerly.sharedInstance.configure(appId: "008bc975")

CustomerlyDemo/AppDelegate.swift

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

CustomerlyDemo/Info.plist

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CustomerlySDK"
-  s.version      = "2.1.0"
+  s.version      = "2.2.0"
   s.summary      = "customerly.io is the perfect tool to getting closer to your customers"
   s.description  = <<-DESC
   					customerly.io is the perfect tool to getting closer to your customers. Help them where they are with the customer support widget. Manage your audience based on their behaviours, build campaigns and automations.
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.module_name  = 'CustomerlySDK'
   s.frameworks  = "UIKit", "Foundation", "AudioToolbox"
   s.requires_arc = true
-  s.dependency 'ObjectMapper', '3.2.0'
-  s.dependency 'Kingfisher', '4.8.0'
-  s.dependency 'Socket.IO-Client-Swift', '13.2.1'
+  s.dependency 'ObjectMapper', '3.3.0'
+  s.dependency 'Kingfisher', '4.10.0'
+  s.dependency 'Socket.IO-Client-Swift', '13.3.0'
 end

CustomerlySDK.podspec

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

CustomerlySDK/Info.plist

@@ -10,7 +10,7 @@ import Kingfisher
 
 @objc @objcMembers open class Customerly: NSObject {
 
-    open static let sharedInstance = Customerly()
+    public static let sharedInstance = Customerly()
     var customerlyAppId: String = ""
     var customerlyIsOpen = false
     var bannerMessages: [CyMessageModel] = []

CustomerlySDK/Library/Customerly.swift

@@ -62,7 +62,7 @@ class CyBanner: CyView {
 
     class func topWindow() -> UIWindow? {
         for window in UIApplication.shared.windows.reversed() {
-            if window.windowLevel == UIWindowLevelNormal && !window.isHidden && window.frame != CGRect.zero { return window }
+            if window.windowLevel == UIWindow.Level.normal && !window.isHidden && window.frame != CGRect.zero { return window }
         }
         return nil
     }

CustomerlySDK/Library/CyBanner.swift

@@ -83,19 +83,19 @@ class CyMessageModel: Mappable {
         attachment.bounds.size = CGSize(width: 50, height: 39)
 
         let attributedAttachment = NSAttributedString(attachment: attachment)
-        let attributedText = NSAttributedString(string: "\n\n\("chatViewRichMessageText".localized(comment: "Chat View"))\n", attributes: [NSAttributedStringKey.foregroundColor:UIColor(hexString:"#1A1A1A")])
+        let attributedText = NSAttributedString(string: "\n\n\("chatViewRichMessageText".localized(comment: "Chat View"))\n", attributes: [NSAttributedString.Key.foregroundColor:UIColor(hexString:"#1A1A1A")])
 
 
         let attributedString = NSMutableAttributedString()
         attributedString.append(attributedAttachment)
         attributedString.append(attributedText)
 
-        attributedString.enumerateAttribute(NSAttributedStringKey.attachment, in: NSRange(location: 0, length: attributedString.length)) { (attribute, range, stop) -> Void in
+        attributedString.enumerateAttribute(NSAttributedString.Key.attachment, in: NSRange(location: 0, length: attributedString.length)) { (attribute, range, stop) -> Void in
             if (attribute as? NSTextAttachment) != nil {
                 //center all attachments in attributed string
                 let paragraphStyle = NSMutableParagraphStyle()
                 paragraphStyle.alignment = .center
-                attributedString.addAttribute(NSAttributedStringKey.paragraphStyle, value: paragraphStyle, range: range)
+                attributedString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: range)
             }
         }
         return attributedString

CustomerlySDK/Library/Models/CyMessageModel.swift

@@ -55,9 +55,9 @@ class CyButton: UIButton {
         self.layer.shadowRadius = self.shadowRadius
 
         if checkboxButton == true{
-            self.setImage(self.uncheckedImage, for: UIControlState.normal)
-            self.setImage(self.checkedImage, for: UIControlState.selected)
-            self.addTarget(self, action: #selector(buttonChecked), for: UIControlEvents.touchUpInside)
+            self.setImage(self.uncheckedImage, for: UIControl.State.normal)
+            self.setImage(self.checkedImage, for: UIControl.State.selected)
+            self.addTarget(self, action: #selector(buttonChecked), for: UIControl.Event.touchUpInside)
         }
 
     }