Fix sendable warnings. (#207)

* Fix sendable warnings. * wip * bring back awaits * wip
pointfreeco · Apr 30, 2024 · f79d393 · f79d393
1 parent 7b139d8
commit f79d393
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/Package.swift b/Package.swift
@@ -55,14 +55,3 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
   )
 #endif
-
-//for target in package.targets {
-//  target.swiftSettings = target.swiftSettings ?? []
-//  target.swiftSettings?.append(
-//    .unsafeFlags([
-//      "-Xfrontend", "-warn-concurrency",
-//      "-Xfrontend", "-enable-actor-data-race-checks",
-//      "-enable-library-evolution",
-//    ])
-//  )
-//}
diff --git a/[email protected] b/[email protected]
@@ -109,13 +109,14 @@ let package = Package(
   )
 #endif
 
-//for target in package.targets {
-//  target.swiftSettings = target.swiftSettings ?? []
+for target in package.targets {
+  target.swiftSettings = target.swiftSettings ?? []
+  target.swiftSettings?.append(contentsOf: [
+    .enableExperimentalFeature("StrictConcurrency")
+  ])
 //  target.swiftSettings?.append(
 //    .unsafeFlags([
-//      "-Xfrontend", "-warn-concurrency",
-//      "-Xfrontend", "-enable-actor-data-race-checks",
 //      "-enable-library-evolution",
 //    ])
 //  )
-//}
+}
diff --git a/Sources/Dependencies/WithDependencies.swift b/Sources/Dependencies/WithDependencies.swift
@@ -326,9 +326,9 @@ private class DependencyObjects: @unchecked Sendable {
   internal init() {}
 
   func store(_ object: AnyObject) {
-    self.storage.withValue { storage in
-      storage[ObjectIdentifier(object)] = DependencyObject(
-        object: object,
+    self.storage.withValue { [id = ObjectIdentifier(object), object = UncheckedSendable(object)] storage in
+      storage[id] = DependencyObject(
+        object: object.wrappedValue,
         dependencyValues: DependencyValues._current
       )
       Task {
@@ -347,7 +347,9 @@ private class DependencyObjects: @unchecked Sendable {
       .compactMap({ $1 as? _HasInitialValues })
       .first?
       .initialValues
-      ?? self.storage.withValue({ $0[ObjectIdentifier(object)]?.dependencyValues })
+    ?? self.storage.withValue({ [id = ObjectIdentifier(object)] in
+      $0[id]?.dependencyValues
+    })
   }
 }