Skip to content

[Swift 6.0] Mark Bundle as Sendable #4978

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.

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 1 commit into from
Jun 12, 2024

Conversation

parkera
Copy link
Contributor

@parkera parkera commented Jun 11, 2024

Cherry-pick of #4963 for Swift 6.

(cherry picked from commit 097f850)
@parkera
Copy link
Contributor Author

parkera commented Jun 11, 2024

@swift-ci test

@parkera parkera changed the title [Swif 6.0] Mark Bundle as Sendable [Swift 6.0] Mark Bundle as Sendable Jun 11, 2024
MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Jun 11, 2024
Foundation added this conformance on their side in `main` (swiftlang/swift-corelibs-foundation#4963) and `release/6.0` (swiftlang/swift-corelibs-foundation#4978).

rdar://129599679
MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Jun 11, 2024
Foundation added this conformance on their side in `main` (swiftlang/swift-corelibs-foundation#4963) and `release/6.0` (swiftlang/swift-corelibs-foundation#4978).

rdar://129599679
MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Jun 12, 2024
Foundation added this conformance on their side in `main` (swiftlang/swift-corelibs-foundation#4963) and `release/6.0` (swiftlang/swift-corelibs-foundation#4978).

rdar://129599679
@parkera parkera merged commit f848fe0 into swiftlang:release/6.0 Jun 12, 2024
2 of 3 checks passed
@parkera parkera deleted the parkera/bundle_sendable_6.0 branch June 12, 2024 18:58
MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Jun 13, 2024
Cherry-pick of #7652.

**Explanation**: We shouldn't have two `Sendable` conformances on `Bundle` at the same time, and Foundation added this on their side in `main` (swiftlang/swift-corelibs-foundation#4963)
and `release/6.0` (swiftlang/swift-corelibs-foundation#4978).
**Scope**: isolated to bundle resources.
**Risk**: low, the corresponding change on `main` branch of
`swift-corelibs-foundation` was there for 3 weeks.
**Testing**: covered by existing tests and the compat suite.
**Issue**: rdar://129599679
**Reviewer**: @parkera, @bnbarham
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant