Swift 6 snapshot fixes (#252)

* Swift 6 snapshot fixes - `@_unsafeInheritExecutor` is now a build failure, we can use `isolated #isolation` instead. - `swift-corelibs-foundation` doesn't yet have a release post-sendability audit, so we can use `UncheckedSendable` to traffic them for now. * wip * wip
pointfreeco · Jul 26, 2024 · f9d7af9 · f9d7af9
1 parent cc26d06
commit f9d7af9
Show file tree

Hide file tree

Showing 5 changed files with 277 additions and 127 deletions.
diff --git a/Sources/Dependencies/DependencyValues/Calendar.swift b/Sources/Dependencies/DependencyValues/Calendar.swift
@@ -18,11 +18,28 @@ extension DependencyValues {
   /// // Make assertions with model...
   /// ```
   public var calendar: Calendar {
-    get { self[CalendarKey.self] }
-    set { self[CalendarKey.self] = newValue }
+    get {
+      #if canImport(Darwin)
+        self[CalendarKey.self]
+      #else
+        self[CalendarKey.self].wrappedValue
+      #endif
+    }
+    set {
+      #if canImport(Darwin)
+        self[CalendarKey.self] = newValue
+      #else
+        self[CalendarKey.self].wrappedValue = newValue
+      #endif
+    }
   }
 
   private enum CalendarKey: DependencyKey {
-    static let liveValue = Calendar.autoupdatingCurrent
+    #if canImport(Darwin)
+      static let liveValue = Calendar.autoupdatingCurrent
+    #else
+      // NB: 'Calendar' sendability is not yet available in a 'swift-corelibs-foundation' release
+      static let liveValue = UncheckedSendable(Calendar.autoupdatingCurrent)
+    #endif
   }
 }
diff --git a/Sources/Dependencies/DependencyValues/Locale.swift b/Sources/Dependencies/DependencyValues/Locale.swift
@@ -29,11 +29,28 @@ extension DependencyValues {
   /// // Make assertions with model...
   /// ```
   public var locale: Locale {
-    get { self[LocaleKey.self] }
-    set { self[LocaleKey.self] = newValue }
+    get {
+      #if canImport(Darwin)
+        self[LocaleKey.self]
+      #else
+        self[LocaleKey.self].wrappedValue
+      #endif
+    }
+    set {
+      #if canImport(Darwin)
+        self[LocaleKey.self] = newValue
+      #else
+        self[LocaleKey.self].wrappedValue = newValue
+      #endif
+    }
   }
 
   private enum LocaleKey: DependencyKey {
-    static let liveValue = Locale.autoupdatingCurrent
+    #if canImport(Darwin)
+      static let liveValue = Locale.autoupdatingCurrent
+    #else
+    // NB: 'Locale' sendability is not yet available in a 'swift-corelibs-foundation' release
+      static let liveValue = UncheckedSendable(Locale.autoupdatingCurrent)
+    #endif
   }
 }
diff --git a/Sources/Dependencies/DependencyValues/TimeZone.swift b/Sources/Dependencies/DependencyValues/TimeZone.swift
@@ -17,11 +17,28 @@ extension DependencyValues {
   /// // Make assertions with model...
   /// ```
   public var timeZone: TimeZone {
-    get { self[TimeZoneKey.self] }
-    set { self[TimeZoneKey.self] = newValue }
+    get {
+      #if canImport(Darwin)
+        self[TimeZoneKey.self]
+      #else
+        self[TimeZoneKey.self].wrappedValue
+      #endif
+    }
+    set {
+      #if canImport(Darwin)
+        self[TimeZoneKey.self] = newValue
+      #else
+        self[TimeZoneKey.self].wrappedValue = newValue
+      #endif
+    }
   }
 
   private enum TimeZoneKey: DependencyKey {
-    static let liveValue = TimeZone.autoupdatingCurrent
+    #if canImport(Darwin)
+      static let liveValue = TimeZone.autoupdatingCurrent
+    #else
+      // NB: 'TimeZone' sendability is not yet available in a 'swift-corelibs-foundation' release
+      static let liveValue = UncheckedSendable(TimeZone.autoupdatingCurrent)
+    #endif
   }
 }
diff --git a/Sources/Dependencies/Internal/Deprecations.swift b/Sources/Dependencies/Internal/Deprecations.swift
@@ -112,7 +112,7 @@ extension DependencyValues {
   }
 
   @available(*, deprecated, message: "Use 'withDependencies' instead.")
-  public static func withValue<Value, R>(
+  public static func withValue<Value, R: Sendable>(
     _ keyPath: WritableKeyPath<DependencyValues, Value>,
     _ value: @autoclosure () -> Value,
     operation: () async throws -> R
@@ -133,7 +133,7 @@ extension DependencyValues {
   }
 
   @available(*, deprecated, message: "Use 'withDependencies' instead.")
-  public static func withValues<R>(
+  public static func withValues<R: Sendable>(
     _ updateValuesForOperation: (inout Self) throws -> Void,
     operation: () async throws -> R
   ) async rethrows -> R {
@@ -149,7 +149,7 @@ extension DependencyValues {
   }
 
   @available(*, deprecated, message: "Use 'withDependencies' instead.")
-  public static func withTestValues<R>(
+  public static func withTestValues<R: Sendable>(
     _ updateValuesForOperation: (inout Self) async throws -> Void,
     assert operation: () async throws -> R
   ) async rethrows -> R {