Update dependencies, correct SwiftLint changes (#1280)

Podfile.lock

@@ -10,67 +10,66 @@ PODS:
     - TABObserverSet (~> 2)
   - CPDAcknowledgements (1.0.0)
   - EMTLoadingIndicator (4.0.0)
-  - Eureka (5.3.1)
-  - Firebase/CoreOnly (6.34.0):
-    - FirebaseCore (= 6.10.4)
-  - Firebase/Messaging (6.34.0):
+  - Eureka (5.3.2)
+  - Firebase/CoreOnly (7.1.0):
+    - FirebaseCore (= 7.1.0)
+  - Firebase/Messaging (7.1.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 4.7.1)
-  - FirebaseCore (6.10.4):
-    - FirebaseCoreDiagnostics (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-  - FirebaseCoreDiagnostics (1.7.0):
-    - GoogleDataTransport (~> 7.4)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-    - nanopb (~> 1.30906.0)
-  - FirebaseInstallations (1.7.0):
-    - FirebaseCore (~> 6.10)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
+    - FirebaseMessaging (~> 7.1.0)
+  - FirebaseCore (7.1.0):
+    - FirebaseCoreDiagnostics (~> 7.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/Logger (~> 7.0)
+  - FirebaseCoreDiagnostics (7.1.0):
+    - GoogleDataTransport (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/Logger (~> 7.0)
+    - nanopb (~> 2.30906.0)
+  - FirebaseInstallations (7.1.0):
+    - FirebaseCore (~> 7.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/UserDefaults (~> 7.0)
     - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (4.8.0):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstallations (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-  - FirebaseMessaging (4.7.1):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstanceID (~> 4.7)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Reachability (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-    - Protobuf (>= 3.9.2, ~> 3.9)
-  - GoogleDataTransport (7.5.1):
-    - nanopb (~> 1.30906.0)
-  - GoogleUtilities/AppDelegateSwizzler (6.7.2):
+  - FirebaseInstanceID (7.1.0):
+    - FirebaseCore (~> 7.0)
+    - FirebaseInstallations (~> 7.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/UserDefaults (~> 7.0)
+  - FirebaseMessaging (7.1.0):
+    - FirebaseCore (~> 7.0)
+    - FirebaseInstanceID (~> 7.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/Reachability (~> 7.0)
+    - GoogleUtilities/UserDefaults (~> 7.0)
+  - GoogleDataTransport (8.0.1):
+    - nanopb (~> 2.30906.0)
+  - GoogleUtilities/AppDelegateSwizzler (7.1.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.7.2):
+  - GoogleUtilities/Environment (7.1.0):
     - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (6.7.2):
+  - GoogleUtilities/Logger (7.1.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (6.7.2):
+  - GoogleUtilities/Network (7.1.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.7.2)"
-  - GoogleUtilities/Reachability (6.7.2):
+  - "GoogleUtilities/NSData+zlib (7.1.0)"
+  - GoogleUtilities/Reachability (7.1.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.7.2):
+  - GoogleUtilities/UserDefaults (7.1.0):
     - GoogleUtilities/Logger
   - KeychainAccess (4.2.1)
   - Lokalise (0.10.0)
-  - lottie-ios (3.1.8)
+  - lottie-ios (3.1.9)
   - MBProgressHUD (1.2.0)
-  - nanopb (1.30906.0):
-    - nanopb/decode (= 1.30906.0)
-    - nanopb/encode (= 1.30906.0)
-  - nanopb/decode (1.30906.0)
-  - nanopb/encode (1.30906.0)
+  - nanopb (2.30906.0):
+    - nanopb/decode (= 2.30906.0)
+    - nanopb/encode (= 2.30906.0)
+  - nanopb/decode (2.30906.0)
+  - nanopb/encode (2.30906.0)
   - ObjcExceptionBridging (1.0.1):
     - ObjcExceptionBridging/ObjcExceptionBridging (= 1.0.1)
   - ObjcExceptionBridging/ObjcExceptionBridging (1.0.1)
@@ -98,23 +97,22 @@ PODS:
   - PromiseKit/UIKit (6.13.1):
     - PromiseKit/CorePromise
   - PromisesObjC (1.2.11)
-  - Protobuf (3.13.0)
   - ReachabilitySwift (5.0.0)
-  - Realm (10.1.0):
-    - Realm/Headers (= 10.1.0)
-  - Realm/Headers (10.1.0)
-  - RealmSwift (10.1.0):
-    - Realm (= 10.1.0)
-  - Sentry (6.0.4):
-    - Sentry/Core (= 6.0.4)
-  - Sentry/Core (6.0.4)
+  - Realm (10.1.4):
+    - Realm/Headers (= 10.1.4)
+  - Realm/Headers (10.1.4)
+  - RealmSwift (10.1.4):
+    - Realm (= 10.1.4)
+  - Sentry (6.0.9):
+    - Sentry/Core (= 6.0.9)
+  - Sentry/Core (6.0.9)
   - SimulatorStatusMagic (2.4.1)
   - Sodium (0.9.0)
   - SwiftGen (6.4.0)
-  - SwiftLint (0.40.3)
-  - SwiftMessages (8.0.2):
-    - SwiftMessages/App (= 8.0.2)
-  - SwiftMessages/App (8.0.2)
+  - SwiftLint (0.41.0)
+  - SwiftMessages (8.0.3):
+    - SwiftMessages/App (= 8.0.3)
+  - SwiftMessages/App (8.0.3)
   - TABObserverSet (2.1.0)
   - UIColor_Hex_Swift (5.1.0)
   - Version (0.8.0)
@@ -179,7 +177,6 @@ SPEC REPOS:
     - OHHTTPStubs
     - PromiseKit
     - PromisesObjC
-    - Protobuf
     - ReachabilitySwift
     - Realm
     - RealmSwift
@@ -228,7 +225,7 @@ CHECKOUT OPTIONS:
     :commit: a593b4d647a970b3d184d046f8f52b945083ccf9
     :git: https://github.com/tristanhimmelman/ObjectMapper.git
   Sodium:
-    :commit: 1763670c2fff9739f180ff91dc4891c47146eaac
+    :commit: 5c88567e8781f0828ab54782738eafb5bc089a65
     :git: https://github.com/jedisct1/swift-sodium.git
   ViewRow:
     :commit: cf9bfd2320a07de716476e8b1c194fe2845b46bd
@@ -241,35 +238,34 @@ SPEC CHECKSUMS:
   Communicator: d870b95ca54965412790334620e2f188c68f2462
   CPDAcknowledgements: 6e15e71849ba4ad5e8a17a0bb9d20938ad23bac8
   EMTLoadingIndicator: 0d3256b0de3e6ba5ab17048acc7aa93af34e48d3
-  Eureka: 859877ab1e85661b6b7e810015d430e937d9cc7d
-  Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999
-  FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec
-  FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
-  FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
-  FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
-  FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
-  GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
-  GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
+  Eureka: 1c2b8b5892bfb0e972d0fe05f8c09fd89f8625ec
+  Firebase: 78e8dd2e39d653de6270432ad84fe8b59f7bf4e8
+  FirebaseCore: 20046127eef0fcb8fa25df7fc12f7b97d4e48611
+  FirebaseCoreDiagnostics: 872cdb9b749b23346dddd5c1014d1babd2257de3
+  FirebaseInstallations: 3de38553e86171b5f81d83cdeef63473d37bfdb0
+  FirebaseInstanceID: 61e8d10a4192a582c6239378169d10e504ca8d91
+  FirebaseMessaging: 076054895c9260f82c7304cc7709dbf19b8f3e4a
+  GoogleDataTransport: e4085e6762f36a6141738f46b0153473ce57fb18
+  GoogleUtilities: f734da554aade8cc7928a31c2f3311897933a1bd
   KeychainAccess: 9b07f665298d13c3a85881bd3171f6f49b8151c1
   Lokalise: bc42066e2dde59b43b46e88ecc0b92b7d593dc72
-  lottie-ios: 48fac6be217c76937e36e340e2d09cf7b10b7f5f
+  lottie-ios: 3a3758ef5a008e762faec9c9d50a39842f26d124
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
-  nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
+  nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
   ObjcExceptionBridging: c30e00eb3700467e695faeea30e26e18bd445001
   ObjectMapper: 5a6c9f063ef67e7fc0d7eb8958919e3121396a96
   OHHTTPStubs: cb29d2a9d09a828ecb93349a2b0c64f99e0db89f
   PromiseKit: 28fda91c973cc377875d8c0ea4f973013c05b6db
   PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
-  Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  Realm: 100df88a0faf5328f48477427e4b3e1a1598bae3
-  RealmSwift: 725d1c10df64964b04aaa0058c19ce0f4b4c3f5a
-  Sentry: df82ff00c907257e62e8ad503ac7afd3a76d52ea
+  Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b
+  RealmSwift: 0e566ca714edb377bba8ea0811eafcea0b93734e
+  Sentry: 388c9dc093b2fd3a264466a5c5b21e25959610a9
   SimulatorStatusMagic: 28d4a9d1a500ac7cea0b2b5a43c1c6ddb40ba56c
   Sodium: 8106500200d1a80021cb9ea069ba0ea71fc26291
   SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
-  SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
-  SwiftMessages: 633304165351b8e3dcbb81a71f8efcd86f9c1669
+  SwiftLint: c585ebd615d9520d7fbdbe151f527977b0534f1e
+  SwiftMessages: 063ec9ffea3ffa7d17ba595157a9ec78e4fe045f
   TABObserverSet: dcdc5087b5dee54a9dcc29e155bb554394829f30
   UIColor_Hex_Swift: 8be7432edacb7fa91c78aa05ef3c30b66e4f9415
   Version: de5907f2c5d0f3cf21708db7801d1d5401139486

Sources/App/AppDelegate.swift

@@ -834,11 +834,14 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
 }
 
 extension AppDelegate: MessagingDelegate {
-    func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String) {
-        Current.Log.info("Firebase registration token refreshed, new token: \(fcmToken)")
+    func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
+        let loggableCurrent = Current.settingsStore.pushID ?? "(null)"
+        let loggableNew = fcmToken ?? "(null)"
 
-        if let existingToken = Current.settingsStore.pushID, existingToken != fcmToken {
-            Current.Log.warning("FCM token has changed from \(existingToken) to \(fcmToken)")
+        Current.Log.info("Firebase registration token refreshed, new token: \(loggableNew)")
+
+        if loggableCurrent != loggableNew {
+            Current.Log.warning("FCM token has changed from \(loggableCurrent) to \(loggableNew)")
         }
 
         Current.crashReporter.setUserProperty(value: fcmToken, name: "FCM Token")

Sources/App/Onboarding/AuthenticationViewController.swift

@@ -144,7 +144,7 @@ class AuthenticationViewController: UIViewController {
         return Promise { seal in
             let sessionManager = HomeAssistantAPI.unauthenticatedManager
             let delegate: Alamofire.SessionDelegate = sessionManager.delegate
-            delegate.taskDidReceiveChallengeWithCompletion = { session, task, challenge, completion in
+            delegate.taskDidReceiveChallengeWithCompletion = { _, _, challenge, completion in
                 let method = challenge.protectionSpace.authenticationMethod
                 Current.Log.verbose("Handling challenge \(method)")
                 if method == NSURLAuthenticationMethodServerTrust {

Sources/App/Settings/AppleWatch/ComplicationEditViewController.swift

@@ -135,7 +135,7 @@ class ComplicationEditViewController: FormViewController, TypedRowControllerType
 
         let textSections = ComplicationTextAreas.allCases.map({ addComplicationTextAreaFormSection(location: $0) })
 
-        TextAreaRow.defaultCellSetup = { cell, row in
+        TextAreaRow.defaultCellSetup = { cell, _ in
             cell.textView.smartQuotesType = .no
             cell.textView.smartDashesType = .no
         }

Sources/App/Settings/Notifications/NotificationCategoryConfigurator.swift

@@ -227,7 +227,7 @@ class NotificationCategoryConfigurator: FormViewController, TypedRowControllerTy
                     return self.getActionRow(nil)
                 }
 
-                section.addButtonProvider = { section in
+                section.addButtonProvider = { _ in
                     self.addButtonRow = ButtonRow {
                         $0.title = L10n.addButtonLabel
                         $0.cellStyle = .value1

Sources/App/Settings/Notifications/NotificationSettingsViewController.swift

@@ -123,10 +123,10 @@ class NotificationSettingsViewController: FormViewController {
                 footer: nil
             ) { section in
                 section.tag = "notification_categories"
-                section.multivaluedRowToInsertAt = { index in
+                section.multivaluedRowToInsertAt = { _ in
                     return self.getNotificationCategoryRow(nil)
                 }
-                section.addButtonProvider = { section in
+                section.addButtonProvider = { _ in
                     return ButtonRow {
                         $0.title = L10n.addButtonLabel
                         $0.cellStyle = .value1

Sources/App/Settings/SettingsDetailViewController.swift

@@ -266,7 +266,7 @@ class SettingsDetailViewController: FormViewController, TypedRowControllerType {
                 section.multivaluedRowToInsertAt = { [unowned self] _ -> ButtonRowWithPresent<ActionConfigurator> in
                     return self.getActionRow(nil)
                 }
-                section.addButtonProvider = { section in
+                section.addButtonProvider = { _ in
                     return ButtonRow {
                         $0.title = L10n.addButtonLabel
                         $0.cellStyle = .value1

Sources/App/Utilities/DNSResolver.swift

@@ -28,7 +28,7 @@ final class DNSResolver {
     ///                         of IPs.
     static func resolve(host: String, timeout: TimeInterval = kDefaultTimeout,
                         completion: @escaping ([InternetAddress]) -> Void) {
-        let callback: CFHostClientCallBack = { host, hostinfo, error, info in
+        let callback: CFHostClientCallBack = { host, _, _, info in
             guard let info = info else {
                 return
             }

Sources/App/WebView/IncomingURLHandler.swift

@@ -130,7 +130,7 @@ extension IncomingURLHandler {
     private func registerCallbackURLKitHandlers() {
         Manager.shared.callbackURLScheme = Manager.urlSchemes?.first
 
-        Manager.shared["fire_event"] = { parameters, success, failure, cancel in
+        Manager.shared["fire_event"] = { parameters, success, failure, _ in
             guard let eventName = parameters["eventName"] else {
                 failure(XCallbackError.eventNameMissing)
                 return
@@ -152,7 +152,7 @@ extension IncomingURLHandler {
             }
         }
 
-        Manager.shared["call_service"] = { parameters, success, failure, cancel in
+        Manager.shared["call_service"] = { parameters, success, failure, _ in
             guard let service = parameters["service"] else {
                 failure(XCallbackError.serviceMissing)
                 return
@@ -178,7 +178,7 @@ extension IncomingURLHandler {
             }
         }
 
-        Manager.shared["send_location"] = { parameters, success, failure, cancel in
+        Manager.shared["send_location"] = { _, success, failure, _ in
             _ = firstly {
                 HomeAssistantAPI.authenticatedAPIPromise
             }.then { api in
@@ -191,7 +191,7 @@ extension IncomingURLHandler {
             }
         }
 
-        Manager.shared["render_template"] = { parameters, success, failure, cancel in
+        Manager.shared["render_template"] = { parameters, success, failure, _ in
             guard let template = parameters["template"] else {
                 failure(XCallbackError.templateMissing)
                 return

Sources/Shared/API/MJPEGStreamer.swift

@@ -10,7 +10,7 @@ public class MJPEGStreamer {
 
     init(manager: Alamofire.SessionManager) {
         self.manager = manager
-        manager.delegate.dataTaskDidReceiveResponse = { [weak self] session, task, response ->
+        manager.delegate.dataTaskDidReceiveResponse = { [weak self] _, _, response ->
             URLSession.ResponseDisposition in
             guard let this = self else {
                 return .cancel

Sources/Shared/Environment/DeviceWrapperBatteryObserver.swift

@@ -81,7 +81,7 @@ public class DeviceWrapperBatteryNotificationCenter {
 
     #if canImport(IOKit)
     private func addIOKitObserver(for notificationName: CFString) {
-        let callback: CFNotificationCallback = { center, observer, name, /* ignored */ _, /* ignored */ _ in
+        let callback: CFNotificationCallback = { _, observer, name, /* ignored */ _, /* ignored */ _ in
             // this block is a C block, which cannot weakly capture self, so we do the dance
             guard let observer = observer else {
                 Current.Log.error("unexpected nil observer for battery sensor")