Update versionCheck protocol for async

Author: ps2

Loop.xcodeproj/project.pbxproj

@@ -4751,6 +4751,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LOCALIZED_STRING_MACRO_NAMES = (
 					NSLocalizedString,
 					CFLocalizedString,
@@ -4860,6 +4861,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LOCALIZED_STRING_MACRO_NAMES = (
 					NSLocalizedString,
 					CFLocalizedString,

Loop/Managers/LoopAppManager.swift

@@ -11,7 +11,6 @@ import Intents
 import Combine
 import LoopKit
 import LoopKitUI
-import TidepoolKit
 import MockKit
 import HealthKit
 import WidgetKit

Loop/Managers/SupportManager.swift

@@ -103,8 +103,9 @@ extension SupportManager {
 // MARK: Version checking
 extension SupportManager {
     func performCheck() {
-        checkVersion { [weak self] versionUpdate in
-            self?.notify(versionUpdate)
+        Task { @MainActor in
+            let versionUpdate = await checkVersion()
+            self.notify(versionUpdate)
         }
     }
 
@@ -114,37 +115,41 @@ extension SupportManager {
         }
     }
 
-    func checkVersion(completion: @escaping (VersionUpdate) -> Void) {
-        let group = DispatchGroup()
-        var results = [String: Result<VersionUpdate?, Error>]()
-        supports.value.values.forEach { support in
-            group.enter()
-            support.checkVersion(bundleIdentifier: Bundle.main.bundleIdentifier!, currentVersion: Bundle.main.shortVersionString) { result in
-                results[support.identifier] = result
-                group.leave()
+    func checkVersion() async -> VersionUpdate {
+
+        let results = await withTaskGroup(of: (VersionUpdate?,String).self) { group in
+            var updatesFromServices = [(VersionUpdate?,String)]()
+
+            supports.value.values.forEach { support in
+                group.addTask {
+                    return (await support.checkVersion(bundleIdentifier: Bundle.main.bundleIdentifier!, currentVersion: Bundle.main.shortVersionString), support.identifier)
+                }
             }
+
+            for await update in group {
+                updatesFromServices.append(update)
+            }
+
+            return updatesFromServices
         }
-        group.notify(queue: DispatchQueue.main) { [weak self] in
-            guard let self = self else { return }
-            self.saveState()
-            let (identifierWithHighestVersionUpdate, aggregatedVersionUpdate) = self.aggregate(results: results)
-            self.identifierWithHighestVersionUpdate = identifierWithHighestVersionUpdate
-            completion(aggregatedVersionUpdate)
-        }
+
+        self.saveState()
+        let (identifierWithHighestVersionUpdate, aggregatedVersionUpdate) = self.aggregate(results: results)
+        self.identifierWithHighestVersionUpdate = identifierWithHighestVersionUpdate
+        return aggregatedVersionUpdate
     }
 
-    private func aggregate(results: [String : Result<VersionUpdate?, Error>]) -> (String?, VersionUpdate) {
+    private func aggregate(results: [(VersionUpdate?,String)]) -> (String?, VersionUpdate) {
         var aggregatedVersionUpdate = VersionUpdate.default
         var identifierWithHighestVersionUpdate: String?
-        results.forEach { key, value in
-            switch value {
-            case .failure(let error):
-                self.log.error("Error from version check %{public}@: %{public}@", key, error.localizedDescription)
-            case .success(let versionUpdate):
-                if let versionUpdate = versionUpdate, versionUpdate > aggregatedVersionUpdate {
+        results.forEach { versionUpdate, identifier in
+            if let versionUpdate {
+                if versionUpdate > aggregatedVersionUpdate {
                     aggregatedVersionUpdate = versionUpdate
-                    identifierWithHighestVersionUpdate = key
+                    identifierWithHighestVersionUpdate = identifier
                 }
+            } else {
+                self.log.error("Version check failed for %{public}@", identifier)
             }
         }
         return (identifierWithHighestVersionUpdate, aggregatedVersionUpdate)
@@ -225,8 +230,8 @@ extension SupportManager {
 fileprivate extension Result where Success == VersionUpdate? {
     var value: VersionUpdate {
         switch self {
-        case .failure: return .none
-        case .success(let val): return val ?? .none
+        case .failure: return .noUpdateNeeded
+        case .success(let val): return val ?? .noUpdateNeeded
         }
     }
 }

LoopTests/Managers/SupportManagerTests.swift

@@ -72,21 +72,21 @@ class SupportManagerTests: XCTestCase {
     }
 
     func testVersionCheckOneService() throws {
-        XCTAssertEqual(VersionUpdate.none, getVersion())
+        XCTAssertEqual(VersionUpdate.noUpdateNeeded, getVersion())
         mockSupport.mockResult = .success(.required)
         XCTAssertEqual(.required, getVersion())
     }
 
     func testVersionCheckOneServiceError() throws {
         // Error doesn't really do anything but log
         mockSupport.mockResult = .failure(MockError.nothing)
-        XCTAssertEqual(VersionUpdate.none, getVersion())
+        XCTAssertEqual(VersionUpdate.noUpdateNeeded, getVersion())
     }
 
     func testVersionCheckMultipleServices() throws {
         let anotherSupport = AnotherMockSupport()
         supportManager.addSupport(anotherSupport)
-        XCTAssertEqual(VersionUpdate.none, getVersion())
+        XCTAssertEqual(VersionUpdate.noUpdateNeeded, getVersion())
         anotherSupport.mockResult = .success(.required)
         XCTAssertEqual(.required, getVersion())
         mockSupport.mockResult = .success(.recommended)