Update to Swift 5.0

dougw · Jul 2, 2021 · 6c8068e · 6c8068e
1 parent 16b42a8
commit 6c8068e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Garmin-ExampleApp-Swift.xcodeproj/project.pbxproj b/Garmin-ExampleApp-Swift.xcodeproj/project.pbxproj
@@ -387,7 +387,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dougw.Garmin-ExampleApp-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -408,7 +408,7 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dougw.Garmin-ExampleApp-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

diff --git a/Source/AppDelegate.swift b/Source/AppDelegate.swift
@@ -41,7 +41,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, IQUIOverrideDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         ConnectIQ.sharedInstance().initialize(withUrlScheme: ReturnURLScheme, uiOverrideDelegate: nil)
         DeviceManager.sharedInstance.restoreDevicesFromFileSystem()
         let viewController = DeviceListViewController.deviceListViewController()
@@ -54,7 +54,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, IQUIOverrideDelegate {
         return true
     }
 
-    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
         print("Received URL: \(url)")
         return DeviceManager.sharedInstance.handleOpenURL(url, options: options)
     }

diff --git a/Source/AppMessageViewController.swift b/Source/AppMessageViewController.swift
@@ -153,6 +153,6 @@ class AppMessageViewController: UIViewController, IQDeviceEventDelegate, IQAppMe
         }
         self.logView.text = (self.logMessages as NSArray).componentsJoined(by: "\n")
         self.logView.layoutManager.ensureLayout(for: self.logView.textContainer)
-        self.logView.scrollRangeToVisible(NSRange(location: self.logView.text.characters.count - 1, length: 1))
+        self.logView.scrollRangeToVisible(NSRange(location: self.logView.text.count - 1, length: 1))
     }
 }
diff --git a/Source/DeviceManager.swift b/Source/DeviceManager.swift
@@ -52,8 +52,8 @@ class DeviceManager: NSObject {
         // no op
     }
 
-    func handleOpenURL(_ url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
-        guard let sourceApplication = options[UIApplicationOpenURLOptionsKey.sourceApplication] as? String else {
+    func handleOpenURL(_ url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+        guard let sourceApplication = options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String else {
             print("handleOpenURL: Source application value was nil, expecting \(IQGCMBundle); disregarind open request, likely not for us.")
             return false
         }