Preliminary fixes for SWIFT_STRICT_CONCURRENCY = complete

m-schmidt · Feb 12, 2024 · 08db074 · 08db074 · m-schmidt · Feb 12, 2024
1 parent c464ae9
commit 08db074
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/Refracto.xcodeproj/project.pbxproj b/Refracto.xcodeproj/project.pbxproj
@@ -437,7 +437,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1200;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1520;
 				TargetAttributes = {
 					4D44ADFF2513FE5300ED5142 = {
 						CreatedOnToolsVersion = 12.0;
@@ -650,6 +650,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Debug;
 		};
@@ -705,6 +706,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

diff --git a/Refracto/AppDelegate.swift b/Refracto/AppDelegate.swift
@@ -22,6 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 // MARK: - Haptic Feedback
 
+@MainActor
 fileprivate var generator: UIImpactFeedbackGenerator? = nil
 
 extension AppDelegate {

diff --git a/Refracto/Formatters.swift b/Refracto/Formatters.swift
@@ -36,6 +36,7 @@ extension NumberFormatter {
     }
 }
 
+@MainActor
 struct Formatter {
     static var brix: NumberFormatter = {
         formatter("#0.0")

diff --git a/Refracto/RefractometerDisplay.swift b/Refracto/RefractometerDisplay.swift
@@ -24,7 +24,7 @@ class RefractometerDisplay: ReadableWidthView {
     }
 
     deinit {
-        unregisterUpdateNotifications()
+        NotificationCenter.default.removeObserver(self)
     }
 
     override var intrinsicContentSize: CGSize {
@@ -40,14 +40,12 @@ extension RefractometerDisplay {
         let notification = Settings.updateNotification
         let main = OperationQueue.main
         NotificationCenter.default.addObserver(forName: notification, object: nil, queue: main) { [weak self] _ in
-            self?.update()
+            Task { @MainActor [weak self] in
+                self?.update()
+            }
         }
     }
 
-    private func unregisterUpdateNotifications() {
-        NotificationCenter.default.removeObserver(self)
-    }
-
     func update() {
         switch Settings.shared.displayScheme {
         case .Modern:

diff --git a/Refracto/RefractometerModel.swift b/Refracto/RefractometerModel.swift
@@ -2,6 +2,7 @@
 
 import Foundation
 
+@MainActor
 final class RefractometerModel: NSObject {
     static var originalExtract: Double {
         let s = Settings.shared

diff --git a/Refracto/Settings.swift b/Refracto/Settings.swift
@@ -54,6 +54,7 @@ enum AppIcon: String, Codable, ItemPickable {
 extension AppIcon {
     static let defaultIcon: AppIcon = .IconGreen
 
+    @MainActor
     static var current: Self {
         guard let id = UIApplication.shared.alternateIconName, let icon = AppIcon(rawValue: id) else { return Self.defaultIcon }
         return icon

diff --git a/Refracto/SettingsController.swift b/Refracto/SettingsController.swift
@@ -23,10 +23,12 @@ enum SupportRow: Int, CaseIterable {
 }
 
 
+@MainActor
 fileprivate func canSendMail() -> Bool {
     return MFMailComposeViewController.canSendMail()
 }
 
+@MainActor
 fileprivate func supportsAlternateIcons() -> Bool {
     return UIApplication.shared.supportsAlternateIcons
 }
@@ -92,13 +94,15 @@ extension SettingsController {
 // MARK: - MFMailComposeViewControllerDelegate
 
 extension SettingsController : MFMailComposeViewControllerDelegate {
-    func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
-        dismiss(animated: true) {
-            if result == .failed {
-                let ok = UIAlertAction(title: "OK", style: .default)
-                let alert = UIAlertController(title: "MailFailedTitle".localized,  message: "MailFailedMessage".localized, preferredStyle: .alert)
-                alert.addAction(ok)
-                self.present(alert, animated: true)
+    nonisolated func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
+        Task { @MainActor in
+            dismiss(animated: true) {
+                if result == .failed {
+                    let ok = UIAlertAction(title: "OK", style: .default)
+                    let alert = UIAlertController(title: "MailFailedTitle".localized,  message: "MailFailedMessage".localized, preferredStyle: .alert)
+                    alert.addAction(ok)
+                    self.present(alert, animated: true)
+                }
             }
         }
     }