[6.0] Update -swift-version to default to 6 for swift-tools-version 6 #7531
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
|
@swift-ci please test |
Technically it's currently running (though I would be very surprised if it failed with anything related to this PR). |
|
Shan't we cherry-pick #7439 as a whole w/o breaking it up? |
We missed updating this when adding 6.0. The change itself is extremely simple, with the bulk being updates to our tests so they don't fail on old compiler versions (where language version "6" is unknown). Also removes disabling the concurrency and string processing imports from manifest loading, as this was causing the `package` global to not be main actor isolated by default and thus error in Swift 6. They seemed to have been disabled to avoid erroring in SDKs that didn't have them, but that is definitely not an issue any longer. (cherry picked from commit de3f697)
bnbarham
force-pushed
the
cherry-6-when-tools-version-6
branch
from
65e5721 to
98f0017
Compare
|
@swift-ci please test |
nkcsgexi
approved these changes
May 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Explanation: Changes packages to default to swift version 6 when
swift-tools-versionis set>= 6.0. Without this change, all packages will be swift version 5 unless otherwise specified viaswiftLanguageVersions. Packages default toswift-tools-version: 6.0withswift package init. Users can opt-out via specifyingswiftLanguageVersions: [.v5].Scope: New packages/those updated to 6.0.
Risk: Medium. There's inherent risk due to the language mode bump. The change also removes disabling implicit imports for concurrency and string processing in manifest files, which hasn't been widely tested outside of ...
Testing: New regression tests. Source compatibility suite run.
Original PR: #7469