Package.swift fixes for Swift 5.4 release #797
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ktoso
reviewed
May 20, 2021
|
|
||
| var globalConcurrencyFlags: [String] = [] | ||
| #if swift(>=5.4) | ||
| #if swift(>=5.4) && os(Linux) |
There was a problem hiding this comment.
Ah I see, it's removed from the release now. Thanks!
There was a problem hiding this comment.
Looks like unavailable on Darwin 😕
$ swift -version
Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
Target: x86_64-apple-darwin20.2.0
$ swift build
[1/1] Planning build
<unknown>:0: error: no such module '_Concurrency'
<unknown>:0: error: no such module '_Concurrency'
There was a problem hiding this comment.
it should be imported automatically on darwin... I'll dig into it hm
There was a problem hiding this comment.
I think we don't need the flag at all tbh
ktoso
reviewed
May 20, 2021
| #elseif swift(>=5.4) | ||
| dependencies.append( | ||
| .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50400.0")) | ||
| ) |
|
A flaky test and failure in Prometheus in samples since it changed API it seems... I'll fix those, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix some issues in Package.swift for the final Swift 5.4 Linux/Darwin releases
Motivation:
There are a couple Package.swift issues that are breaking builds under Swift 5.4 for both Linux and Darwin:
-enable-experimental-concurrencyflag only appears to be present in Swift 5.4 for Linuxswift-syntaxsnapshot selected for 5.4 doesn't appear to be compatible with the final 5.4 releaseModifications:
-enable-experimental-concurrencyflag for Linux platforms0.50400.0release ofswift-syntaxswift-syntaxdevelopment snapshot for Swift versions beyond 5.4Result: