Skip to content

Enable Swift 6 mode when available, sync QueryEngine sources #136

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 8 commits into from
Aug 29, 2024

Conversation

MaxDesiatov
Copy link
Contributor

As SwiftPM is more actively developed, let's consider it to be the source of truth and vendor QueryEngine back into swift-sdk-generator together with more fresh AsyncFileSystem code, storing all those files in Source/Helpers/Vendor subdirectory.

All this allows us to fix concurrency errors that prevent it from building in Swift 6 mode.

As SwiftPM is more actively developed, let's consider it to be the source of truth and vendor it back into `swift-sdk-generator` together with more fresh `AsyncFileSystem` code. This allows us to fix concurrency errors that prevent it from building in Swift 6 mode.
@MaxDesiatov MaxDesiatov added the dependencies Changes to dependencies label Aug 28, 2024
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov requested a review from euanh August 28, 2024 16:55
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov requested a review from bnbarham August 28, 2024 17:20
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@kateinoigakukun
Copy link
Member

Let me check 5.8 compatibility before merging

MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Aug 28, 2024
This expands available `AsyncFileSystem` APIs and brings them in sync with `swift-sdk-generator` as implemented in swiftlang/swift-sdk-generator#136.
@kateinoigakukun
Copy link
Member

@MaxDesiatov We need this change against AsyncFileSystem to keep 5.8 compatibility. swiftlang/swift-package-manager#7928
Could you update the vendored files after the PR is merged?

MaxDesiatov pushed a commit to swiftlang/swift-package-manager that referenced this pull request Aug 29, 2024
AsyncFileSystem is going to be vendored into swift-sdk-generator (swiftlang/swift-sdk-generator#136), and the tool is built with bootstrapping toolchain that is Swift 5.8 on ci.swift.org. This commit makes the vendored AsyncFileSystem compatible with Swift 5.8 by avoiding the use of SE-0380.
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@kateinoigakukun done, ready for review

@MaxDesiatov MaxDesiatov merged commit ea3e824 into main Aug 29, 2024
3 checks passed
@MaxDesiatov MaxDesiatov deleted the maxd/fix-swift6-errors branch August 29, 2024 12:44
MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Sep 20, 2024
This expands available `AsyncFileSystem` APIs and brings them in sync with `swift-sdk-generator` as implemented in swiftlang/swift-sdk-generator#136.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Changes to dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants