Skip to content

Fixes another Xcode 16 beta 6 problem. #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 26, 2024
Merged

Fixes another Xcode 16 beta 6 problem. #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb7eed3
Fixes another Xcode 16 beta 6 problem.
mbrandonw Aug 22, 2024
2ba95bc
Revert "Fixes another Xcode 16 beta 6 problem."
mbrandonw Aug 22, 2024
0fdb052
wip
mbrandonw Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions Dependencies.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 20 additions & 21 deletions Sources/Dependencies/WithDependencies.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@ public func withDependencies<R>(
_ updateValuesForOperation: (inout DependencyValues) async throws -> Void,
operation: () async throws -> R
) async rethrows -> R {
try await isSetting(true) {
#if DEBUG
try await DependencyValues.$isSetting.withValue(true) {
var dependencies = DependencyValues._current
try await updateValuesForOperation(&dependencies)
return try await DependencyValues.$_current.withValue(dependencies) {
try await isSetting(false) {
try await DependencyValues.$isSetting.withValue(false) {
let result = try await operation()
if R.self is AnyClass {
dependencyObjects.store(result as AnyObject)
Expand All @@ -78,6 +79,17 @@ public func withDependencies<R>(
}
}
}
#else
var dependencies = DependencyValues._current
try await updateValuesForOperation(&dependencies)
return try await DependencyValues.$_current.withValue(dependencies) {
let result = try await operation()
if R.self is AnyClass {
dependencyObjects.store(result as AnyObject)
}
return result
}
#endif
}
#else
@_unsafeInheritExecutor
Expand Down Expand Up @@ -471,27 +483,14 @@ private func isSetting<R>(
_ value: Bool,
operation: () throws -> R
) rethrows -> R {
#if DEBUG
try DependencyValues.$isSetting.withValue(value, operation: operation)
#else
try operation()
#endif
#if DEBUG
try DependencyValues.$isSetting.withValue(value, operation: operation)
#else
try operation()
#endif
}

#if swift(>=6)
@_transparent
private func isSetting<R>(
_ value: Bool,
isolation: isolated (any Actor)? = #isolation,
operation: () async throws -> R
) async rethrows -> R {
#if DEBUG
try await DependencyValues.$isSetting.withValue(value, operation: operation)
#else
try await operation()
#endif
}
#else
#if swift(<6)
@_transparent
private func isSetting<R>(
_ value: Bool,
Expand Down