switch to swift 5.9

Signed-off-by: weak <[email protected]>
openhab · Oct 17, 2023 · 8794c3a · 8794c3a
1 parent 39ee3e1
commit 8794c3a
Show file tree

Hide file tree

Showing 22 changed files with 119 additions and 125 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.7
+5.9
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/NumberState.swift b/OpenHABCore/Sources/OpenHABCore/Model/NumberState.swift
@@ -49,9 +49,9 @@ public struct NumberState: CustomStringConvertible, Equatable {
 
     private func getActualValue() -> NSNumber {
         if format?.contains("%d") == true {
-            return NSNumber(value: Int(value))
+            NSNumber(value: Int(value))
         } else {
-            return NSNumber(value: value)
+            NSNumber(value: value)
         }
     }
 }
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABServerProperties.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABServerProperties.swift
@@ -26,9 +26,9 @@ public class OpenHABServerProperties: Decodable {
 
     public func linkUrl(byType type: String?) -> String? {
         if let index = links.firstIndex(where: { $0.type == type }) {
-            return links[index].url
+            links[index].url
         } else {
-            return nil
+            nil
         }
     }
 }
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
@@ -121,9 +121,9 @@ public class OpenHABWidget: NSObject, MKAnnotation, Identifiable {
 
     public var mappingsOrItemOptions: [OpenHABWidgetMapping] {
         if mappings.isEmpty, let itemOptions = item?.stateDescription?.options {
-            return itemOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label) }
+            itemOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label) }
         } else {
-            return mappings
+            mappings
         }
     }
 

diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
@@ -210,13 +210,13 @@ public extension Endpoint {
 
     static func iconForDrawer(rootUrl: String, version: Int, icon: String) -> Endpoint {
         if version == 2 {
-            return Endpoint(
+            Endpoint(
                 baseURL: rootUrl,
                 path: "/icon/\(icon).png",
                 queryItems: []
             )
         } else {
-            return Endpoint(
+            Endpoint(
                 baseURL: rootUrl,
                 path: "/images/\(icon).png",
                 queryItems: []

diff --git a/OpenHABCore/Sources/OpenHABCore/Util/StringExtension.swift b/OpenHABCore/Sources/OpenHABCore/Util/StringExtension.swift
@@ -27,9 +27,9 @@ public extension String {
 
     internal var intValue: Int {
         if let asNumber = NumberFormatter().number(from: self) {
-            return asNumber.intValue
+            asNumber.intValue
         } else {
-            return Int.max
+            Int.max
         }
     }
 
@@ -140,9 +140,9 @@ extension String? {
     var orEmpty: String {
         switch self {
         case let .some(value):
-            return value
+            value
         case .none:
-            return ""
+            ""
         }
     }
 }
diff --git a/openHAB/AppDelegate.swift b/openHAB/AppDelegate.swift
@@ -113,7 +113,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             guard let self else { return }
             os_log("Permission granted: %{PUBLIC}@", log: .notifications, type: .info, granted ? "YES" : "NO")
             guard granted else { return }
-            self.getNotificationSettings()
+            getNotificationSettings()
         }
     }
 

diff --git a/openHAB/OpenHABDrawerItem.swift b/openHAB/OpenHABDrawerItem.swift
@@ -18,20 +18,20 @@ enum OpenHABDrawerItem {
     var localizedString: String {
         switch self {
         case .settings:
-            return NSLocalizedString("settings", comment: "")
+            NSLocalizedString("settings", comment: "")
         case .notifications:
-            return NSLocalizedString("notifications", comment: "")
+            NSLocalizedString("notifications", comment: "")
         }
     }
 
     static func openHABDrawerItem(localizedString: String) -> OpenHABDrawerItem {
         switch localizedString {
         case OpenHABDrawerItem.settings.localizedString:
-            return OpenHABDrawerItem.settings
+            OpenHABDrawerItem.settings
         case OpenHABDrawerItem.notifications.localizedString:
-            return OpenHABDrawerItem.notifications
+            OpenHABDrawerItem.notifications
         default:
-            return OpenHABDrawerItem.settings
+            OpenHABDrawerItem.settings
         }
     }
 }
diff --git a/openHAB/OpenHABDrawerTableViewController.swift b/openHAB/OpenHABDrawerTableViewController.swift
@@ -173,30 +173,30 @@ class OpenHABDrawerTableViewController: UITableViewController {
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch section {
         case 0:
-            return 1
+            1
         case 1:
-            return uiTiles.count
+            uiTiles.count
         case 2:
-            return sitemaps.count
+            sitemaps.count
         case 3:
-            return drawerItems.count
+            drawerItems.count
         default:
-            return 0
+            0
         }
     }
 
     override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         switch section {
         case 0:
-            return "Main"
+            "Main"
         case 1:
-            return "Tiles"
+            "Tiles"
         case 2:
-            return "Sitemaps"
+            "Sitemaps"
         case 3:
-            return "System"
+            "System"
         default:
-            return "Unknown"
+            "Unknown"
         }
     }
 

diff --git a/openHAB/OpenHABSettingsViewController.swift b/openHAB/OpenHABSettingsViewController.swift
@@ -197,17 +197,17 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
     override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         switch section {
         case 0:
-            return NSLocalizedString("openhab_connection", comment: "")
+            NSLocalizedString("openhab_connection", comment: "")
         case 1:
-            return NSLocalizedString("application_settings", comment: "")
+            NSLocalizedString("application_settings", comment: "")
         case 2:
-            return NSLocalizedString("mainui_settings", comment: "")
+            NSLocalizedString("mainui_settings", comment: "")
         case 3:
-            return NSLocalizedString("sitemap_settings", comment: "")
+            NSLocalizedString("sitemap_settings", comment: "")
         case 4:
-            return NSLocalizedString("about_settings", comment: "")
+            NSLocalizedString("about_settings", comment: "")
         default:
-            return ""
+            ""
         }
     }
 

diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
@@ -86,9 +86,9 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
 
     var relevantPage: OpenHABSitemapPage? {
         if isFiltering {
-            return filteredPage
+            filteredPage
         } else {
-            return currentPage
+            currentPage
         }
     }
 
@@ -337,7 +337,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
                 var openHABSitemapPage: OpenHABSitemapPage?
 
                 // If we are talking to openHAB 1.X, talk XML
-                if self.appData?.openHABVersion == 1 {
+                if appData?.openHABVersion == 1 {
                     let str = String(decoding: data, as: UTF8.self)
                     os_log("%{PUBLIC}@", log: .remoteAccess, type: .info, str)
 
@@ -363,31 +363,31 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
                     }
                 }
 
-                self.currentPage = openHABSitemapPage
-                if self.isFiltering {
-                    self.filterContentForSearchText(self.search.searchBar.text)
+                currentPage = openHABSitemapPage
+                if isFiltering {
+                    filterContentForSearchText(search.searchBar.text)
                 }
 
-                self.currentPage?.sendCommand = { [weak self] item, command in
+                currentPage?.sendCommand = { [weak self] item, command in
                     self?.sendCommand(item, commandToSend: command)
                 }
                 // isUserInteracting fixes https://github.com/openhab/openhab-ios/issues/646 where reloading while the user is interacting can have unintended consequences
-                if !self.isUserInteracting {
-                    self.widgetTableView.reloadData()
-                    self.refreshControl?.endRefreshing()
+                if !isUserInteracting {
+                    widgetTableView.reloadData()
+                    refreshControl?.endRefreshing()
                 } else {
-                    self.isWaitingToReload = true
+                    isWaitingToReload = true
                 }
-                self.parent?.navigationItem.title = self.currentPage?.title.components(separatedBy: "[")[0]
+                parent?.navigationItem.title = currentPage?.title.components(separatedBy: "[")[0]
 
-                self.loadPage(true)
+                loadPage(true)
             case let .failure(error):
                 os_log("On LoadPage \"%{PUBLIC}@\" code: %d ", log: .remoteAccess, type: .error, error.localizedDescription, response.response?.statusCode ?? 0)
 
                 NetworkConnection.atmosphereTrackingId = ""
                 if (error as NSError?)?.code == -1001, longPolling {
                     os_log("Timeout, restarting requests", log: OSLog.remoteAccess, type: .error)
-                    self.loadPage(false)
+                    loadPage(false)
                 } else if error.isExplicitlyCancelledError {
                     os_log("Request was cancelled", log: OSLog.remoteAccess, type: .error)
                 } else {

diff --git a/openHAB/OpenHABTracker.swift b/openHAB/OpenHABTracker.swift
@@ -71,8 +71,8 @@ class OpenHABTracker: NSObject {
             guard let self else { return }
             let nStatus = status
             // use a timer to prevent bouncing/flapping around when switching between wifi, vpn, and wwan
-            self.restartTimer?.invalidate()
-            self.restartTimer = Timer.scheduledTimer(withTimeInterval: 3.0, repeats: false) { _ in
+            restartTimer?.invalidate()
+            restartTimer = Timer.scheduledTimer(withTimeInterval: 3.0, repeats: false) { _ in
                 if nStatus != self.oldReachabilityStatus {
                     if let oldReachabilityStatus = self.oldReachabilityStatus {
                         os_log("OpenHABTracker Network status changed from %{PUBLIC}@ to %{PUBLIC}@", log: OSLog.remoteAccess, type: .info, self.string(from: oldReachabilityStatus) ?? "", self.string(from: nStatus) ?? "")
@@ -276,9 +276,9 @@ class OpenHABTracker: NSObject {
     func string(from status: NetworkReachabilityManager.NetworkReachabilityStatus) -> String? {
         switch status {
         case .unknown, .notReachable:
-            return "unreachable"
+            "unreachable"
         case let .reachable(connectionType):
-            return connectionType == .ethernetOrWiFi ? "WiFi" : "WWAN"
+            connectionType == .ethernetOrWiFi ? "WiFi" : "WWAN"
         }
     }
 

diff --git a/openHAB/SetpointUITableViewCell.swift b/openHAB/SetpointUITableViewCell.swift
@@ -41,12 +41,11 @@ class SetpointUITableViewCell: GenericUITableViewCell {
     private func handleUpDown(down: Bool) {
         var numberState = widget?.stateValueAsNumberState
         let stateValue = numberState?.value ?? widget.minValue
-        let newValue: Double
-        switch down {
+        let newValue: Double = switch down {
         case true:
-            newValue = stateValue - widget.step
+            stateValue - widget.step
         case false:
-            newValue = stateValue + widget.step
+            stateValue + widget.step
         }
         if newValue >= widget.minValue, newValue <= widget.maxValue {
             if numberState != nil {

diff --git a/openHAB/SliderUITableViewCell.swift b/openHAB/SliderUITableViewCell.swift
@@ -71,9 +71,9 @@ class SliderUITableViewCell: GenericUITableViewCell {
 
     private func adjustedValue() -> Double {
         if let item = widget.item {
-            return adj(item.stateAsDouble())
+            adj(item.stateAsDouble())
         } else {
-            return widget.minValue
+            widget.minValue
         }
     }
 

diff --git a/openHAB/SpinnerViewController.swift b/openHAB/SpinnerViewController.swift
@@ -12,13 +12,11 @@
 import UIKit
 
 class SpinnerViewController: UIViewController {
-    private var spinner: UIActivityIndicatorView = {
-        if #available(iOS 13.0, *) {
-            return UIActivityIndicatorView(style: .large)
-        } else {
-            return UIActivityIndicatorView(style: .gray)
-        }
-    }()
+    private var spinner: UIActivityIndicatorView = if #available(iOS 13.0, *) {
+        .init(style: .large)
+    } else {
+        .init(style: .gray)
+    }
 
     override func loadView() {
         view = UIView()

diff --git a/openHAB/VideoUITableViewCell.swift b/openHAB/VideoUITableViewCell.swift
@@ -20,13 +20,11 @@ enum VideoEncoding: String {
 }
 
 class VideoUITableViewCell: GenericUITableViewCell {
-    private var activityIndicator: UIActivityIndicatorView = {
-        if #available(iOS 13.0, *) {
-            return UIActivityIndicatorView(style: .medium)
-        } else {
-            return UIActivityIndicatorView(style: .gray)
-        }
-    }()
+    private var activityIndicator: UIActivityIndicatorView = if #available(iOS 13.0, *) {
+        .init(style: .medium)
+    } else {
+        .init(style: .gray)
+    }
 
     var didLoad: (() -> Void)?
 

diff --git a/openHABIntents/IntentHandler.swift b/openHABIntents/IntentHandler.swift
@@ -15,13 +15,13 @@ import OpenHABCore
 class IntentHandler: INExtension {
     override func handler(for intent: INIntent) -> Any {
         switch intent {
-        case is OpenHABGetItemStateIntent: return GetItemStateIntentHandler()
-        case is OpenHABSetSwitchStateIntent: return SetSwitchStateIntentHandler()
-        case is OpenHABSetNumberValueIntent: return SetNumberValueIntentHandler()
-        case is OpenHABSetStringValueIntent: return SetStringValueIntentHandler()
-        case is OpenHABSetColorValueIntent: return SetColorValueIntentHandler()
-        case is OpenHABSetContactStateValueIntent: return SetContactStateValueIntentHandler()
-        default: return SetDimmerRollerValueIntentHandler()
+        case is OpenHABGetItemStateIntent: GetItemStateIntentHandler()
+        case is OpenHABSetSwitchStateIntent: SetSwitchStateIntentHandler()
+        case is OpenHABSetNumberValueIntent: SetNumberValueIntentHandler()
+        case is OpenHABSetStringValueIntent: SetStringValueIntentHandler()
+        case is OpenHABSetColorValueIntent: SetColorValueIntentHandler()
+        case is OpenHABSetContactStateValueIntent: SetContactStateValueIntentHandler()
+        default: SetDimmerRollerValueIntentHandler()
         }
     }
 }
diff --git a/openHABWatch Extension/OpenHABWatchTracker.swift b/openHABWatch Extension/OpenHABWatchTracker.swift
@@ -46,15 +46,15 @@ class OpenHABWatchTracker: NSObject {
             guard let self else { return }
 
             let nStatus = path
-            if nStatus != self.oldReachabilityStatus {
-                if let oldReachabilityStatus = self.oldReachabilityStatus {
+            if nStatus != oldReachabilityStatus {
+                if let oldReachabilityStatus {
                     os_log("Network status changed from %{PUBLIC}@ to %{PUBLIC}@", log: OSLog.remoteAccess, type: .info, oldReachabilityStatus.debugDescription, nStatus.debugDescription)
                 }
-                self.oldReachabilityStatus = nStatus
-                (self.delegate as? OpenHABWatchTrackerExtendedDelegate)?.openHABTrackingNetworkChange(nStatus)
-                if self.isNetworkConnected() {
-                    self.pathMonitor.cancel()
-                    self.selectUrl()
+                oldReachabilityStatus = nStatus
+                (delegate as? OpenHABWatchTrackerExtendedDelegate)?.openHABTrackingNetworkChange(nStatus)
+                if isNetworkConnected() {
+                    pathMonitor.cancel()
+                    selectUrl()
                 }
             }
         }

diff --git a/openHABWatch Extension/Views/Rows/SetpointRow.swift b/openHABWatch Extension/Views/Rows/SetpointRow.swift
@@ -60,12 +60,11 @@ struct SetpointRow: View {
     private func handleUpDown(down: Bool) {
         var numberState = widget.stateValueAsNumberState
         let stateValue = numberState?.value ?? widget.minValue
-        let newValue: Double
-        switch down {
+        let newValue: Double = switch down {
         case true:
-            newValue = stateValue - widget.step
+            stateValue - widget.step
         case false:
-            newValue = stateValue + widget.step
+            stateValue + widget.step
         }
         if newValue >= widget.minValue, newValue <= widget.maxValue {
             numberState?.value = newValue