Working on strict concurrency

FetchRequests.xcodeproj/project.pbxproj

@@ -768,7 +768,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = "";
 				LastSwiftUpdateCheck = 1100;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1540;
 				ORGANIZATIONNAME = "Speramus Inc.";
 				TargetAttributes = {
 					471C506B22C6D0DB007F73E9 = {
@@ -1215,6 +1215,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1283,7 +1284,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_STRICT_CONCURRENCY = targeted;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "";
@@ -1300,6 +1301,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1361,7 +1363,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_STRICT_CONCURRENCY = targeted;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "";

FetchRequests.xcodeproj/xcshareddata/xcschemes/FetchRequests-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

FetchRequests.xcodeproj/xcshareddata/xcschemes/FetchRequests-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

FetchRequests.xcodeproj/xcshareddata/xcschemes/FetchRequests-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

FetchRequests.xcodeproj/xcshareddata/xcschemes/FetchRequests-visionOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

FetchRequests.xcodeproj/xcshareddata/xcschemes/FetchRequests-watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

FetchRequests/Sources/Associations/AssociatedValueReference.swift

@@ -15,7 +15,7 @@ struct AssociatedValueKey<FetchedObject: FetchableObject>: Hashable {
     var keyPath: PartialKeyPath<FetchedObject>
 }
 
-class FetchableAssociatedValueReference<Entity: FetchableObject>: AssociatedValueReference {
+class FetchableAssociatedValueReference<Entity: FetchableObject>: AssociatedValueReference, @unchecked Sendable {
     private var observations: [Entity: [InvalidatableToken]] = [:]
 
     fileprivate override func stopObservingValue() {

FetchRequests/Sources/Controller/CollapsibleSectionsFetchedResultsController.swift

@@ -266,14 +266,16 @@ public extension CollapsibleSectionsFetchedResultsController {
 // MARK: - Fetch Methods
 public extension CollapsibleSectionsFetchedResultsController {
     @MainActor
-    func performFetch(completion: @escaping @MainActor () -> Void = {}) {
+    func performFetch(
+        completion: @escaping @MainActor @Sendable () -> Void = {}
+    ) {
         fetchController.performFetch(completion: completion)
     }
 
     @MainActor
     func resort(
         using newSortDescriptors: [NSSortDescriptor],
-        completion: @escaping @MainActor () -> Void = {}
+        completion: @escaping @MainActor @Sendable () -> Void = {}
     ) {
         fetchController.resort(using: newSortDescriptors, completion: completion)
     }

FetchRequests/Sources/Controller/FetchedResultsController.swift

@@ -18,7 +18,7 @@ import WatchKit
 
 // MARK: - Delegate
 
-public enum FetchedResultsChange<Location: Equatable>: Equatable {
+public enum FetchedResultsChange<Location: Equatable & Sendable>: Equatable, Sendable {
     case insert(location: Location)
     case delete(location: Location)
     case update(location: Location)
@@ -151,7 +151,7 @@ public enum FetchedResultsError: Error {
 
 // MARK: - Sections
 
-public struct FetchedResultsSection<FetchedObject: FetchableObject>: Equatable, Identifiable {
+public struct FetchedResultsSection<FetchedObject: FetchableObject>: Equatable, Identifiable, Sendable {
     public let name: String
     public fileprivate(set) var objects: [FetchedObject]
 
@@ -171,7 +171,10 @@ public struct FetchedResultsSection<FetchedObject: FetchableObject>: Equatable,
 
 // MARK: - FetchedResultsController
 
-func performOnMainThread(async: Bool = true, handler: @escaping @MainActor () -> Void) {
+func performOnMainThread(
+    async: Bool = true,
+    handler: @escaping @MainActor @Sendable () -> Void
+) {
     @MainActor(unsafe)
     func unsafeHandler() {
         handler()
@@ -188,7 +191,7 @@ func performOnMainThread(async: Bool = true, handler: @escaping @MainActor () ->
     }
 }
 
-public class FetchedResultsController<FetchedObject: FetchableObject>: NSObject, FetchedResultsControllerProtocol {
+public class FetchedResultsController<FetchedObject: FetchableObject>: NSObject, FetchedResultsControllerProtocol, @unchecked Sendable {
     public typealias Delegate = FetchedResultsControllerDelegate<FetchedObject>
 
     public typealias Section = FetchedResultsSection<FetchedObject>
@@ -338,7 +341,9 @@ public class FetchedResultsController<FetchedObject: FetchableObject>: NSObject,
 
 public extension FetchedResultsController {
     @MainActor
-    func performFetch(completion: @escaping @MainActor () -> Void) {
+    func performFetch(
+        completion: @escaping @MainActor @Sendable () -> Void
+    ) {
         startObservingNotificationsIfNeeded()
 
         definition.request { [weak self] objects in
@@ -353,7 +358,7 @@ public extension FetchedResultsController {
     @MainActor
     func resort(
         using newSortDescriptors: [NSSortDescriptor],
-        completion: @escaping @MainActor () -> Void
+        completion: @escaping @MainActor @Sendable () -> Void
     ) {
         assert(Thread.isMainThread)
 
@@ -555,7 +560,7 @@ private extension FetchedResultsController {
         updateFetchOrder: Bool = true,
         emitChanges: Bool = true,
         dropObjectsToInsert: Bool = true,
-        completion: @escaping @MainActor () -> Void
+        completion: @escaping @MainActor @Sendable () -> Void
     ) {
         assert(Thread.isMainThread)
 
@@ -573,7 +578,7 @@ private extension FetchedResultsController {
         updateFetchOrder: Bool = true,
         emitChanges: Bool = true,
         dropObjectsToInsert: Bool = true,
-        completion: @escaping @MainActor () -> Void
+        completion: @escaping @MainActor @Sendable () -> Void
     ) {
         guard objects.count <= 100 || !Thread.isMainThread else {
             // Bounce ourself off of the main queue
@@ -667,10 +672,10 @@ private extension FetchedResultsController {
     }
 
     @MainActor
-    func insert<C: Collection>(
+    func insert<C: Collection & Sendable>(
         _ objects: C,
         emitChanges: Bool = true,
-        completion: @escaping @MainActor () -> Void
+        completion: @escaping @MainActor @Sendable () -> Void
     ) where C.Element == FetchedObject {
         // This is snapshotted because we're potentially about to be off the main thread
         let fetchedObjectIDs = self.fetchedObjectIDs
@@ -705,11 +710,11 @@ private extension FetchedResultsController {
         return sortedObjects
     }
 
-    private func unsafeInsert<C: Collection>(
+    private func unsafeInsert<C: Collection & Sendable>(
         _ objects: C,
         fetchedObjectIDs: OrderedSet<FetchedObject.ID>,
         emitChanges: Bool = true,
-        completion: @escaping @MainActor () -> Void
+        completion: @escaping @MainActor @Sendable () -> Void
     ) where C.Element == FetchedObject {
         guard objects.count <= 100 || !Thread.isMainThread else {
             // Bounce ourself off of the main queue

FetchRequests/Sources/Controller/FetchedResultsControllerProtocol.swift

@@ -39,9 +39,14 @@ public protocol FetchedResultsControllerProtocol<FetchedObject>: DoublyObservabl
     var sortDescriptors: [NSSortDescriptor] { get }
 
     @MainActor
-    func performFetch(completion: @escaping @MainActor () -> Void)
+    func performFetch(
+        completion: @escaping @MainActor @Sendable () -> Void
+    )
     @MainActor
-    func resort(using newSortDescriptors: [NSSortDescriptor], completion: @escaping @MainActor () -> Void)
+    func resort(
+        using newSortDescriptors: [NSSortDescriptor],
+        completion: @escaping @MainActor @Sendable () -> Void
+    )
     @MainActor
     func reset()
 

FetchRequests/Sources/Controller/PausableFetchedResultsController.swift

@@ -127,12 +127,17 @@ public class PausableFetchedResultsController<FetchedObject: FetchableObject> {
 
 extension PausableFetchedResultsController: FetchedResultsControllerProtocol {
     @MainActor
-    public func performFetch(completion: @escaping @MainActor () -> Void) {
+    public func performFetch(
+        completion: @escaping @MainActor @Sendable () -> Void
+    ) {
         controller.performFetch(completion: completion)
     }
 
     @MainActor
-    public func resort(using newSortDescriptors: [NSSortDescriptor], completion: @escaping @MainActor () -> Void) {
+    public func resort(
+        using newSortDescriptors: [NSSortDescriptor],
+        completion: @escaping @MainActor @Sendable () -> Void
+    ) {
         controller.resort(using: newSortDescriptors, completion: completion)
     }
 

FetchRequests/Sources/FetchableObject.swift

@@ -23,7 +23,7 @@ public protocol RawDataRepresentable<RawData> {
 }
 
 /// A class of types that should be fetchable via FetchRequests
-public protocol FetchableObjectProtocol: NSObjectProtocol, Identifiable, RawDataRepresentable {
+public protocol FetchableObjectProtocol: NSObjectProtocol, Identifiable, RawDataRepresentable, Sendable where ID: Sendable {
     /// Has this object been marked as deleted?
     var isDeleted: Bool { get }