Merge pull request #39 from krazywarez/fix-actor-isolationHEADmain

Adopt Swift 6 language mode

5 files changed, 13 insertions, 11 deletions

diff --git a/Hutch/Views/Lists/MailingListListView.swift b/Hutch/Views/Lists/MailingListListView.swift
index 1b159bf..b6ed2ff 100644
--- a/Hutch/Views/Lists/MailingListListView.swift
+++ b/Hutch/Views/Lists/MailingListListView.swift
@@ -100,7 +100,7 @@ final class MailingListListViewModel {
                 query: Self.createMailingListMutation,
                 variables: [
                     "name": trimmedName,
-                    "description": trimmedDescription.isEmpty ? nil as String? as Any : trimmedDescription,
+                    "description": trimmedDescription.isEmpty ? nil as String? as any Sendable : trimmedDescription,
                     "visibility": visibility.rawValue
                 ],
                 responseType: Response.self
diff --git a/Hutch/Views/More/TipStoreViewModel.swift b/Hutch/Views/More/TipStoreViewModel.swift
index bc909c1..043b218 100644
--- a/Hutch/Views/More/TipStoreViewModel.swift
+++ b/Hutch/Views/More/TipStoreViewModel.swift
@@ -32,7 +32,9 @@ final class TipStoreViewModel {
     var errorMessage: String?
     var statusMessage: String?
 
-    private var transactionUpdatesTask: Task<Void, Never>?
+    // Internal task handle, not observable state; assigned only on the main
+    // actor and read once from the nonisolated deinit.
+    @ObservationIgnored nonisolated(unsafe) private var transactionUpdatesTask: Task<Void, Never>?
 
     init() {
         transactionUpdatesTask = Task.detached(priority: .background) {
diff --git a/Hutch/Views/Repositories/RepositoryDetailViewModel.swift b/Hutch/Views/Repositories/RepositoryDetailViewModel.swift
index 82e1592..62a8b12 100644
--- a/Hutch/Views/Repositories/RepositoryDetailViewModel.swift
+++ b/Hutch/Views/Repositories/RepositoryDetailViewModel.swift
@@ -557,7 +557,7 @@ final class RepositoryDetailViewModel {
                 variables: [
                     "repoId": repository.id,
                     "revspec": revspec,
-                    "file": nil as String? as Any
+                    "file": nil as String? as any Sendable
                 ],
                 file: MultipartUploadFile(
                     variablePath: "file",
diff --git a/Hutch/Views/Repositories/SyntaxHighlighter.swift b/Hutch/Views/Repositories/SyntaxHighlighter.swift
index 5ae8f58..dfab443 100644
--- a/Hutch/Views/Repositories/SyntaxHighlighter.swift
+++ b/Hutch/Views/Repositories/SyntaxHighlighter.swift
@@ -3,7 +3,7 @@ import Highlightr
 import SwiftUI
 import UIKit
 
-enum SyntaxHighlightTheme {
+nonisolated enum SyntaxHighlightTheme {
     case light
     case dark
 
@@ -31,7 +31,7 @@ enum SyntaxHighlightTheme {
 /// instance must stay on the thread/task that created it. Callers that fail to
 /// resolve a language — or hit an unavailable engine — get `nil` and should
 /// fall back to plain, escaped text.
-final class SyntaxHighlighter {
+nonisolated final class SyntaxHighlighter {
     private let highlightr: Highlightr?
     private let supportedLanguages: Set<String>
 
@@ -208,7 +208,7 @@ final class SyntaxHighlighter {
     ]
 }
 
-private extension UIColor {
+nonisolated private extension UIColor {
     /// `#rrggbb` for HTML inline styles, or `nil` if the color isn't RGB-convertible.
     var hexRGBString: String? {
         var red: CGFloat = 0
diff --git a/Hutch/Views/Settings/SettingsViewModel.swift b/Hutch/Views/Settings/SettingsViewModel.swift
index 8536e60..2d57ba5 100644
--- a/Hutch/Views/Settings/SettingsViewModel.swift
+++ b/Hutch/Views/Settings/SettingsViewModel.swift
@@ -198,9 +198,9 @@ final class SettingsViewModel {
         do {
             let input: [String: any Sendable] = [
                 "email": email,
-                "url": url.isEmpty ? nil as String? as Any : url,
-                "location": location.isEmpty ? nil as String? as Any : location,
-                "bio": bio.isEmpty ? nil as String? as Any : bio
+                "url": url.isEmpty ? nil as String? as any Sendable : url,
+                "location": location.isEmpty ? nil as String? as any Sendable : location,
+                "bio": bio.isEmpty ? nil as String? as any Sendable : bio
             ]
             let result = try await client.execute(
                 service: .meta,
@@ -243,7 +243,7 @@ final class SettingsViewModel {
         do {
             // The input variable has avatar set to null; the actual file
             // is sent as a separate multipart part per graphql-multipart-request-spec.
-            let input: [String: any Sendable] = ["avatar": nil as String? as Any]
+            let input: [String: any Sendable] = ["avatar": nil as String? as any Sendable]
             let result = try await client.executeMultipart(
                 service: .meta,
                 query: Self.updateUserMutation,
@@ -286,7 +286,7 @@ final class SettingsViewModel {
         error = nil
 
         do {
-            let input: [String: any Sendable] = ["avatar": nil as String? as Any]
+            let input: [String: any Sendable] = ["avatar": nil as String? as any Sendable]
             let result = try await client.execute(
                 service: .meta,
                 query: Self.updateUserMutation,