Revert "Box @Fetch* property wrappers in SwiftUI state when possible (#486)

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: macOS
     strategy:
       matrix:
-        xcode: ["26.6"]
+        xcode: ["26.2"]
         config: ["debug", "release"]
     runs-on: macos-26
     steps:
@@ -32,7 +32,7 @@ jobs:
     name: Examples
     strategy:
       matrix:
-        xcode: ["26.6"]
+        xcode: ["26.2"]
         config: ["debug"]
         scheme: ["Reminders", "CaseStudies", "SyncUps"]
     runs-on: macos-26

Examples/Examples.xcodeproj/project.pbxproj

@@ -1100,7 +1100,6 @@
 			isa = XCLocalSwiftPackageReference;
 			relativePath = ..;
 			traits = (
-				CasePaths,
 				LazyInitializableByDefault,
 			);
 		};
@@ -1122,6 +1121,9 @@
 				kind = upToNextMajorVersion;
 				minimumVersion = 1.7.0;
 			};
+			traits = (
+				Clocks,
+			);
 		};
 		DCBE8A122D4842BF0071F499 /* XCRemoteSwiftPackageReference "swift-case-paths" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -1138,6 +1140,8 @@
 				kind = upToNextMajorVersion;
 				minimumVersion = 2.2.3;
 			};
+			traits = (
+			);
 		};
 /* End XCRemoteSwiftPackageReference section */
 

Package.swift

@@ -68,6 +68,7 @@ let package = Package(
     .target(
       name: "SQLiteData",
       dependencies: [
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "Dependencies", package: "swift-dependencies"),
         .product(name: "GRDB", package: "GRDB.swift"),
         .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
@@ -86,6 +87,7 @@ let package = Package(
       name: "SQLiteDataTestSupport",
       dependencies: [
         "SQLiteData",
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "ConcurrencyExtrasTestSupport", package: "swift-concurrency-extras"),
         .product(name: "CustomDump", package: "swift-custom-dump"),
         .product(name: "Dependencies", package: "swift-dependencies"),

Package@swift-6.0.swift

@@ -35,6 +35,7 @@ let package = Package(
     .target(
       name: "SQLiteData",
       dependencies: [
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "Dependencies", package: "swift-dependencies"),
         .product(name: "GRDB", package: "GRDB.swift"),
         .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
@@ -47,6 +48,7 @@ let package = Package(
       name: "SQLiteDataTestSupport",
       dependencies: [
         "SQLiteData",
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "CustomDump", package: "swift-custom-dump"),
         .product(name: "Dependencies", package: "swift-dependencies"),
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),

Sources/SQLiteData/CloudKit/CloudKitSharing.swift

@@ -1,5 +1,6 @@
 #if canImport(CloudKit)
   public import CloudKit
+  import ConcurrencyExtras
   import GRDB
   import IssueReporting
   public import StructuredQueries
@@ -240,7 +241,7 @@
     }
 
     func unshare(share: CKShare) async throws {
-      let result = try await syncEngines.withLock(\.private)?.database.modifyRecords(
+      let result = try await syncEngines.private?.database.modifyRecords(
         saving: [],
         deleting: [share.recordID]
       )

Sources/SQLiteData/CloudKit/Internal/DataManager.swift

@@ -1,4 +1,5 @@
 #if canImport(CloudKit) && canImport(CryptoKit)
+  package import ConcurrencyExtras
   import CryptoKit
   import Dependencies
   package import Foundation
@@ -54,7 +55,7 @@
     package init() {}
 
     package func load(_ url: URL) throws -> Data {
-      try storage.withLock { storage in
+      try storage.withValue { storage in
         guard let data = storage[url]
         else {
           struct FileNotFound: Error {}
@@ -65,11 +66,11 @@
     }
 
     package func save(_ data: Data, to url: URL) throws {
-      storage.withLock { $0[url] = data }
+      storage.withValue { $0[url] = data }
     }
 
     package func sha256(of fileURL: URL) -> Data? {
-      storage.withLock {
+      storage.withValue {
         $0[fileURL].map {
           Data(SHA256.hash(data: $0))
         }

Sources/SQLiteData/CloudKit/Internal/MockCloudContainer.swift

@@ -1,4 +1,5 @@
 #if canImport(CloudKit)
+  package import ConcurrencyExtras
   package import CloudKit
   import Dependencies
 
@@ -22,21 +23,21 @@
 
       guard let containerIdentifier else { return }
       @Dependency(\.mockCloudContainers) var mockCloudContainers
-      mockCloudContainers.withLock { storage in
+      mockCloudContainers.withValue { storage in
         storage[containerIdentifier] = self
       }
     }
 
     package func accountStatus() -> CKAccountStatus {
-      _accountStatus.withLock(\.self)
+      _accountStatus.withValue(\.self)
     }
 
     package var rawValue: CKContainer {
       fatalError("This should never be called in tests.")
     }
 
     package func accountStatus() async throws -> CKAccountStatus {
-      _accountStatus.withLock { $0 }
+      _accountStatus.withValue { $0 }
     }
 
     package func shareMetadata(
@@ -48,7 +49,7 @@
         ? privateCloudDatabase
         : sharedCloudDatabase
 
-      let rootRecord: CKRecord? = database.state.withLock {
+      let rootRecord: CKRecord? = database.state.withValue {
         $0.storage[share.recordID.zoneID]?.records.values.first { record in
           record.share?.recordID == share.recordID
         }
@@ -79,7 +80,7 @@
       -> MockCloudContainer
     {
       @Dependency(\.mockCloudContainers) var mockCloudContainers
-      return mockCloudContainers.withLock { storage in
+      return mockCloudContainers.withValue { storage in
         let container: MockCloudContainer
         if let existingContainer = storage[containerIdentifier] {
           return existingContainer