Merge pull request #1027 from LoopKit/swift5

Update to Swift 5

Author: ps2

Learn/Lessons/TimeInRangeLesson.swift

@@ -177,7 +177,6 @@ private class TimeInRangeCalculator {
                     os_log(.error, log: self.log, "Failed to fetch samples: %{public}@", String(describing: error))
                     completion(error)
                 case .success(let samples):
-
                     if let timeInRange = samples.proportion(where: { self.range.contains($0.quantity) }) {
                         _ = results.mutate({ (results) in
                             results[day] = timeInRange

Loop Status Extension/StatusViewController.swift

@@ -100,10 +100,12 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         extensionContext?.widgetLargestAvailableDisplayMode = .expanded
 
         switch extensionContext?.widgetActiveDisplayMode ?? .compact {
-        case .compact:
-            glucoseChartContentView.isHidden = true
         case .expanded:
             glucoseChartContentView.isHidden = false
+        case .compact:
+            fallthrough
+        @unknown default:
+            glucoseChartContentView.isHidden = true
         }
 
         observers = [
@@ -121,10 +123,12 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         let compactHeight = hudView.systemLayoutSizeFitting(maxSize).height + subtitleLabel.systemLayoutSizeFitting(maxSize).height
 
         switch activeDisplayMode {
-        case .compact:
-            preferredContentSize = CGSize(width: maxSize.width, height: compactHeight)
         case .expanded:
             preferredContentSize = CGSize(width: maxSize.width, height: compactHeight + 100)
+        case .compact:
+            fallthrough
+        @unknown default:
+            preferredContentSize = CGSize(width: maxSize.width, height: compactHeight)
         }
     }
 
@@ -275,10 +279,12 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         }
 
         switch extensionContext?.widgetActiveDisplayMode ?? .compact {
-        case .compact:
-            glucoseChartContentView.isHidden = true
         case .expanded:
             glucoseChartContentView.isHidden = false
+        case .compact:
+            fallthrough
+        @unknown default:
+            glucoseChartContentView.isHidden = true
         }
 
         // Right now we always act as if there's new data.

Loop.xcodeproj/project.pbxproj

@@ -20,20 +20,6 @@
                ReferencedContainer = "container:Loop.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C189E6AF22B410CA005904DA"
-               BuildableName = "Merge Feature Flags"
-               BlueprintName = "Merge Feature Flags"
-               ReferencedContainer = "container:Loop.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme

@@ -24,7 +24,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         return window?.rootViewController as? RootNavigationController
     }
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window?.tintColor = UIColor.tintColor
 
         NotificationManager.authorize(delegate: self)
@@ -56,7 +56,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
     // MARK: - Continuity
 
-    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
 
         if #available(iOS 12.0, *) {
             if userActivity.activityType == NewCarbEntryIntent.className {

Loop/AppDelegate.swift

@@ -10,7 +10,7 @@ extension RangeReplaceableCollection where Element: Equatable {
     /// Returns `true` if the element was removed, or `false` if it is not present in the collection.
     @discardableResult
     mutating func remove(_ element: Element) -> Bool {
-        guard let index = self.index(of: element) else {
+        guard let index = self.firstIndex(of: element) else {
             return false
         }
 

Loop/Extensions/RangeReplaceableCollection.swift

@@ -225,7 +225,7 @@ final class LoopDataManager {
 
     // MARK: - Background task management
 
-    private var backgroundTask: UIBackgroundTaskIdentifier = UIBackgroundTaskInvalid
+    private var backgroundTask: UIBackgroundTaskIdentifier = .invalid
 
     private func startBackgroundTask() {
         endBackgroundTask()
@@ -235,9 +235,9 @@ final class LoopDataManager {
     }
 
     private func endBackgroundTask() {
-        if backgroundTask != UIBackgroundTaskInvalid {
+        if backgroundTask != .invalid {
             UIApplication.shared.endBackgroundTask(backgroundTask)
-            backgroundTask = UIBackgroundTaskInvalid
+            backgroundTask = .invalid
         }
     }
 }

Loop/Managers/LoopDataManager.swift

@@ -78,7 +78,7 @@ struct NotificationManager {
             notification.body = error.localizedDescription
         }
 
-        notification.sound = UNNotificationSound.default()
+        notification.sound = .default
 
         if startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5) {
             notification.categoryIdentifier = LoopNotificationCategory.bolusFailure.rawValue
@@ -122,7 +122,7 @@ struct NotificationManager {
             }
 
             notification.title = NSLocalizedString("Loop Failure", comment: "The notification title for a loop failure")
-            notification.sound = UNNotificationSound.default()
+            notification.sound = .default
             notification.categoryIdentifier = LoopNotificationCategory.loopNotRunning.rawValue
             notification.threadIdentifier = LoopNotificationCategory.loopNotRunning.rawValue
 
@@ -157,7 +157,7 @@ struct NotificationManager {
 
         notification.title = NSLocalizedString("Pump Battery Low", comment: "The notification title for a low pump battery")
         notification.body = NSLocalizedString("Change the pump battery immediately", comment: "The notification alert describing a low pump battery")
-        notification.sound = UNNotificationSound.default()
+        notification.sound = .default
         notification.categoryIdentifier = LoopNotificationCategory.pumpBatteryLow.rawValue
 
         let request = UNNotificationRequest(
@@ -178,7 +178,7 @@ struct NotificationManager {
 
         notification.title = NSLocalizedString("Pump Reservoir Empty", comment: "The notification title for an empty pump reservoir")
         notification.body = NSLocalizedString("Change the pump reservoir now", comment: "The notification alert describing an empty pump reservoir")
-        notification.sound = UNNotificationSound.default()
+        notification.sound = .default
         notification.categoryIdentifier = LoopNotificationCategory.pumpReservoirEmpty.rawValue
 
         let request = UNNotificationRequest(
@@ -211,7 +211,7 @@ struct NotificationManager {
             notification.body = String(format: NSLocalizedString("%1$@ U left", comment: "Low reservoir alert format string. (1: Number of units remaining)"), unitsString)
         }
 
-        notification.sound = UNNotificationSound.default()
+        notification.sound = .default
         notification.categoryIdentifier = LoopNotificationCategory.pumpReservoirLow.rawValue
 
         let request = UNNotificationRequest(

Loop/Managers/NotificationManager.swift

@@ -279,6 +279,8 @@ extension WatchDataManager: WCSessionDelegate {
             }
         case .inactive, .notActivated:
             break
+        @unknown default:
+            break
         }
     }
 

Loop/Managers/WatchDataManager.swift

@@ -56,7 +56,7 @@ final class CarbAbsorptionViewController: ChartsTableViewController, Identifiabl
 
         navigationItem.rightBarButtonItems?.append(editButtonItem)
 
-        tableView.rowHeight = UITableViewAutomaticDimension
+        tableView.rowHeight = UITableView.automaticDimension
 
         reloadData(animated: false)
     }
@@ -432,7 +432,7 @@ final class CarbAbsorptionViewController: ChartsTableViewController, Identifiabl
         }
     }
 
-    public override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
+    public override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
         if editingStyle == .delete {
             let status = carbStatuses[indexPath.row]
             deviceManager.loopManager.carbStore.deleteCarbEntry(status.entry) { (result) -> Void in