Update examples to use default main actor (#248)

mbrandonw · web-flow · commit 0c3d0ce0ef2c · 2025-10-15T13:23:11.000-05:00
* Default main actor isolation in examples.

* wip

* wip

* wip

* wip

* wip

* convert more examples

* wip

* Update Package.swift
diff --git a/Examples/CaseStudies/Animations.swift b/Examples/CaseStudies/Animations.swift
@@ -47,7 +47,7 @@ struct AnimationsCaseStudy: SwiftUICaseStudy {
 }
 
 @Table
-private struct Fact: Identifiable {
+nonisolated private struct Fact: Identifiable {
   let id: Int
   var body: String
 }
diff --git a/Examples/CaseStudies/DynamicQuery.swift b/Examples/CaseStudies/DynamicQuery.swift
@@ -100,7 +100,7 @@ struct DynamicQueryDemo: SwiftUICaseStudy {
 }
 
 @Table
-private struct Fact: Identifiable {
+nonisolated private struct Fact: Identifiable {
   let id: Int
   var body: String
 }
diff --git a/Examples/CaseStudies/ObservableModelDemo.swift b/Examples/CaseStudies/ObservableModelDemo.swift
@@ -87,7 +87,7 @@ private class Model {
 }
 
 @Table
-private struct Fact: Identifiable {
+nonisolated private struct Fact: Identifiable {
   let id: Int
   var body: String
 }
diff --git a/Examples/CaseStudies/SwiftDataTemplateDemo.swift b/Examples/CaseStudies/SwiftDataTemplateDemo.swift
@@ -56,7 +56,7 @@ struct SwiftDataTemplateView: SwiftUICaseStudy {
 }
 
 @Table
-private struct Item: Identifiable {
+nonisolated private struct Item: Identifiable {
   let id: Int
   var timestamp: Date
 }
diff --git a/Examples/CaseStudies/SwiftUIDemo.swift b/Examples/CaseStudies/SwiftUIDemo.swift
@@ -56,7 +56,7 @@ struct SwiftUIDemo: SwiftUICaseStudy {
 }
 
 @Table
-private struct Fact: Identifiable {
+nonisolated private struct Fact: Identifiable {
   let id: Int
   var body: String
 }
diff --git a/Examples/CaseStudies/TransactionDemo.swift b/Examples/CaseStudies/TransactionDemo.swift
@@ -71,7 +71,7 @@ struct TransactionDemo: SwiftUICaseStudy {
 }
 
 @Table
-private struct Fact: Identifiable {
+nonisolated private struct Fact: Identifiable {
   static let databaseTableName = "facts"
   let id: Int
   var body: String
diff --git a/Examples/CaseStudies/UIKitDemo.swift b/Examples/CaseStudies/UIKitDemo.swift
@@ -107,13 +107,13 @@ final class UIKitCaseStudyViewController: UICollectionViewController, UIKitCaseS
     }
   }
 
-  enum Section: Hashable {
+  nonisolated enum Section: Hashable {
     case facts
   }
 }
 
 @Table
-private struct Fact: Hashable, Identifiable {
+nonisolated private struct Fact: Hashable, Identifiable {
   let id: Int
   var body: String
 }
diff --git a/Examples/CloudKitDemo/Schema.swift b/Examples/CloudKitDemo/Schema.swift
@@ -3,7 +3,7 @@ import OSLog
 import SQLiteData
 
 @Table
-struct Counter: Identifiable {
+nonisolated struct Counter: Identifiable {
   let id: UUID
   var count = 0
 }
diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj
@@ -430,7 +430,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1640;
-				LastUpgradeCheck = 1620;
+				LastUpgradeCheck = 2610;
 				TargetAttributes = {
 					CA2BDD9C2E71C30B000974D3 = {
 						CreatedOnToolsVersion = 16.4;
@@ -639,7 +639,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.SQLiteData.CloudKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -670,7 +669,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.SQLiteData.CloudKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -801,7 +799,10 @@
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 6.0;
 			};
@@ -858,7 +859,10 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
 				SWIFT_VERSION = 6.0;
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Examples/Examples.xcodeproj/xcshareddata/xcschemes/CaseStudies.xcscheme b/Examples/Examples.xcodeproj/xcshareddata/xcschemes/CaseStudies.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1620"
+   LastUpgradeVersion = "2610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Examples/Examples.xcodeproj/xcshareddata/xcschemes/Reminders.xcscheme b/Examples/Examples.xcodeproj/xcshareddata/xcschemes/Reminders.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1620"
+   LastUpgradeVersion = "2610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Examples/Examples.xcodeproj/xcshareddata/xcschemes/SyncUps.xcscheme b/Examples/Examples.xcodeproj/xcshareddata/xcschemes/SyncUps.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1620"
+   LastUpgradeVersion = "2610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Examples/Reminders/Helpers.swift b/Examples/Reminders/Helpers.swift
@@ -2,11 +2,13 @@ import SQLiteData
 import SwiftUI
 
 extension Color {
-  public struct HexRepresentation: QueryRepresentable {
+  nonisolated public struct HexRepresentation: QueryBindable, QueryDecodable, QueryRepresentable {
     public var queryOutput: Color
+
     public init(queryOutput: Color) {
       self.queryOutput = queryOutput
     }
+
     public init(hexValue: Int64) {
       self.init(
         queryOutput: Color(
@@ -17,6 +19,7 @@ extension Color {
         )
       )
     }
+
     public var hexValue: Int64? {
       guard let components = UIColor(queryOutput).cgColor.components
       else { return nil }
@@ -26,25 +29,22 @@ extension Color {
       let a = Int64((components.indices.contains(3) ? components[3] : 1) * 0xFF)
       return r | g | b | a
     }
-  }
-}
 
-extension Color.HexRepresentation: QueryBindable {
-  public init?(queryBinding: StructuredQueriesCore.QueryBinding) {
-    guard case .int(let hexValue) = queryBinding else { return nil }
-    self.init(hexValue: hexValue)
-  }
-  public var queryBinding: QueryBinding {
-    guard let hexValue else {
-      struct InvalidColor: Error {}
-      return .invalid(InvalidColor())
+    public init?(queryBinding: StructuredQueriesCore.QueryBinding) {
+      guard case .int(let hexValue) = queryBinding else { return nil }
+      self.init(hexValue: hexValue)
     }
-    return .int(hexValue)
-  }
-}
 
-extension Color.HexRepresentation: QueryDecodable {
-  public init(decoder: inout some QueryDecoder) throws {
-    try self.init(hexValue: Int64(decoder: &decoder))
+    public var queryBinding: QueryBinding {
+      guard let hexValue else {
+        struct InvalidColor: Error {}
+        return .invalid(InvalidColor())
+      }
+      return .int(hexValue)
+    }
+
+    public init(decoder: inout some QueryDecoder) throws {
+      try self.init(hexValue: Int64(decoder: &decoder))
+    }
   }
 }
diff --git a/Examples/Reminders/RemindersListForm.swift b/Examples/Reminders/RemindersListForm.swift
@@ -79,7 +79,7 @@ struct RemindersListForm: View {
             await withErrorReporting {
               try await database.write { db in
                 let remindersListID =
-                  try RemindersList
+                try RemindersList
                   .upsert { remindersList }
                   .returning(\.id)
                   .fetchOne(db)
diff --git a/Examples/Reminders/Schema.swift b/Examples/Reminders/Schema.swift
@@ -7,7 +7,7 @@ import SwiftUI
 import Synchronization
 
 @Table
-struct RemindersList: Hashable, Identifiable {
+nonisolated struct RemindersList: Hashable, Identifiable {
   let id: UUID
   @Column(as: Color.HexRepresentation.self)
   var color: Color = Self.defaultColor
@@ -21,15 +21,15 @@ struct RemindersList: Hashable, Identifiable {
 extension RemindersList.Draft: Identifiable {}
 
 @Table
-struct RemindersListAsset: Hashable, Identifiable {
+nonisolated struct RemindersListAsset: Hashable, Identifiable {
   @Column(primaryKey: true)
   let remindersListID: RemindersList.ID
   var coverImage: Data?
   var id: RemindersList.ID { remindersListID }
 }
 
 @Table
-struct Reminder: Hashable, Identifiable {
+nonisolated struct Reminder: Hashable, Identifiable {
   let id: UUID
   var dueDate: Date?
   var isFlagged = false
@@ -64,7 +64,7 @@ extension Updates<Reminder> {
 extension Reminder.Draft: Identifiable {}
 
 @Table
-struct Tag: Hashable, Identifiable {
+nonisolated struct Tag: Hashable, Identifiable {
   @Column(primaryKey: true)
   var title: String
   var id: String { title }
@@ -77,7 +77,7 @@ extension Reminder {
     .leftJoin(Tag.all) { $1.tagID.eq($2.primaryKey) }
 }
 
-extension Reminder.TableColumns {
+nonisolated extension Reminder.TableColumns {
   var isCompleted: some QueryExpression<Bool> {
     status.neq(Reminder.Status.incomplete)
   }
@@ -94,14 +94,14 @@ extension Reminder.TableColumns {
   }
 }
 
-extension Tag {
+nonisolated extension Tag {
   static let withReminders = group(by: \.primaryKey)
     .leftJoin(ReminderTag.all) { $0.primaryKey.eq($1.tagID) }
     .leftJoin(Reminder.all) { $1.reminderID.eq($2.id) }
 }
 
 @Table("remindersTags")
-struct ReminderTag: Identifiable {
+nonisolated struct ReminderTag: Identifiable {
   let id: UUID
   let reminderID: Reminder.ID
   let tagID: Tag.ID
@@ -348,9 +348,9 @@ func appDatabase() throws -> any DatabaseWriter {
   return database
 }
 
-let reminderStatusMutex = Mutex<Task<Void, any Error>?>(nil)
+nonisolated let reminderStatusMutex = Mutex<Task<Void, any Error>?>(nil)
 @DatabaseFunction
-func handleReminderStatusUpdate() {
+nonisolated func handleReminderStatusUpdate() {
   reminderStatusMutex.withLock {
     $0?.cancel()
     $0 = Task {
@@ -367,7 +367,7 @@ func handleReminderStatusUpdate() {
   }
 }
 
-private let logger = Logger(subsystem: "Reminders", category: "Database")
+nonisolated private let logger = Logger(subsystem: "Reminders", category: "Database")
 
 #if DEBUG
   extension Database {
diff --git a/Examples/SyncUps/Dependencies/OpenSettings.swift b/Examples/SyncUps/Dependencies/OpenSettings.swift
@@ -2,12 +2,12 @@ import Dependencies
 import UIKit
 
 extension DependencyValues {
-  var openSettings: @Sendable () async -> Void {
+  nonisolated var openSettings: @Sendable () async -> Void {
     get { self[OpenSettingsKey.self] }
     set { self[OpenSettingsKey.self] = newValue }
   }
 
-  private enum OpenSettingsKey: DependencyKey {
+  nonisolated private enum OpenSettingsKey: DependencyKey {
     typealias Value = @Sendable () async -> Void
 
     static let liveValue: @Sendable () async -> Void = {
diff --git a/Examples/SyncUps/Dependencies/SoundEffectClient.swift b/Examples/SyncUps/Dependencies/SoundEffectClient.swift
@@ -3,12 +3,10 @@ import Dependencies
 import DependenciesMacros
 
 @DependencyClient
-struct SoundEffectClient {
+nonisolated struct SoundEffectClient: DependencyKey {
   var load: @Sendable (_ fileName: String) -> Void
   var play: @Sendable () -> Void
-}
 
-extension SoundEffectClient: DependencyKey {
   static var liveValue: Self {
     let player = LockIsolated(AVPlayer())
     return Self(
@@ -37,7 +35,7 @@ extension SoundEffectClient: DependencyKey {
 }
 
 extension DependencyValues {
-  var soundEffectClient: SoundEffectClient {
+  nonisolated var soundEffectClient: SoundEffectClient {
     get { self[SoundEffectClient.self] }
     set { self[SoundEffectClient.self] = newValue }
   }
diff --git a/Examples/SyncUps/Dependencies/SpeechClient.swift b/Examples/SyncUps/Dependencies/SpeechClient.swift
diff --git a/Examples/SyncUps/RecordMeeting.swift b/Examples/SyncUps/RecordMeeting.swift
diff --git a/Examples/SyncUps/Schema.swift b/Examples/SyncUps/Schema.swift

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ struct AnimationsCaseStudy: SwiftUICaseStudy {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Table`
`50`		`-private struct Fact: Identifiable {`
	`50`	`+nonisolated private struct Fact: Identifiable {`
`51`	`51`	`let id: Int`
`52`	`52`	`var body: String`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ struct DynamicQueryDemo: SwiftUICaseStudy {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`@Table`
`103`		`-private struct Fact: Identifiable {`
	`103`	`+nonisolated private struct Fact: Identifiable {`
`104`	`104`	`let id: Int`
`105`	`105`	`var body: String`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ private class Model {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Table`
`90`		`-private struct Fact: Identifiable {`
	`90`	`+nonisolated private struct Fact: Identifiable {`
`91`	`91`	`let id: Int`
`92`	`92`	`var body: String`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ struct SwiftDataTemplateView: SwiftUICaseStudy {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Table`
`59`		`-private struct Item: Identifiable {`
	`59`	`+nonisolated private struct Item: Identifiable {`
`60`	`60`	`let id: Int`
`61`	`61`	`var timestamp: Date`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ struct SwiftUIDemo: SwiftUICaseStudy {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Table`
`59`		`-private struct Fact: Identifiable {`
	`59`	`+nonisolated private struct Fact: Identifiable {`
`60`	`60`	`let id: Int`
`61`	`61`	`var body: String`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ struct TransactionDemo: SwiftUICaseStudy {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Table`
`74`		`-private struct Fact: Identifiable {`
	`74`	`+nonisolated private struct Fact: Identifiable {`
`75`	`75`	`static let databaseTableName = "facts"`
`76`	`76`	`let id: Int`
`77`	`77`	`var body: String`
Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,13 @@ final class UIKitCaseStudyViewController: UICollectionViewController, UIKitCaseS`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- enum Section: Hashable {`
	`110`	`+ nonisolated enum Section: Hashable {`
`111`	`111`	`case facts`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`@Table`
`116`		`-private struct Fact: Hashable, Identifiable {`
	`116`	`+nonisolated private struct Fact: Hashable, Identifiable {`
`117`	`117`	`let id: Int`
`118`	`118`	`var body: String`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import OSLog`
`3`	`3`	`import SQLiteData`
`4`	`4`
`5`	`5`	`@Table`
`6`		`-struct Counter: Identifiable {`
	`6`	`+nonisolated struct Counter: Identifiable {`
`7`	`7`	`let id: UUID`
`8`	`8`	`var count = 0`
`9`	`9`	`}`