-
Notifications
You must be signed in to change notification settings - Fork 1.4k
[6.0][SE-0435] Implement per target swift version selection #7567
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
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
(cherry picked from commit 8df1d14)
Swift Forums pitch thread - https://forums.swift.org/t/pitch-swiftpm-swift-language-version-per-target/71067 Add a new Swift target setting API, similar to `enable{Upcoming, Experimental}Feature`, to specify a Swift language version that should be used to build the target, if such version is not specified, fallback to the current language version determination logic. Resolves: rdar://125732014 (cherry picked from commit 7d47669)
(cherry picked from commit 73769de)
…sion` The value of this field is computed based on the tools version of the manifest and is intended to be used as a fallback if there is no swift language version specified in the build settings for a swift target. (cherry picked from commit e53bb51)
… into `toolsSwiftVersion` (cherry picked from commit 3bedafa)
…SION` declaration Instead of putting it into `OTHER_SWIFT_FLAGS`, let's introduce a dedicated declaration scope - `SWIFT_VERSION` to ease handling and discovery. Resolves: rdar://127883018 (cherry picked from commit 9183b7c)
This setting is going to be used if there are no non-default assignments that match build environment conditions. (cherry picked from commit eb3abcd)
…of a build setting Start using "default" assignments to represent tools version based swift language version setting that is going to be produced by `BuildSettings.Scope` if no other assignments match build environment conditions. This removes ambiguity from `-swift-version` selection for downstream clients. (cherry picked from commit b0e724b)
Since `toolSwiftVersion` is gone and swift language version is now handled by the build settings we need to adjust `PIFBuilder` to handle that properly. PIF build settings can handle per-target platform specific settings which are now expressible in SwiftPM via `.swiftLanguageVersion` build setting, handling of such settings is implemented in this commit. (cherry picked from commit 3793551)
@swift-ci please test |
@swift-ci please clean test Linux platform |
bnbarham
approved these changes
May 15, 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.
Implementation of SE-0435 proposal.
Add a new Swift target setting API, similar to
enable{Upcoming, Experimental}Feature
,to specify a Swift language version that should be used to build the target, if such
version is not specified, fallback to the current language version determination logic.
Scope: TargetDescription API and build system.
Main Branch PRs: Implement per target swift version selection #7439, [PackageModel] SwiftTarget: Rename
swiftVersion
intotoolsSwiftVersion
#7544, [PackageModel] Associated swift version build setting with `SWIFT_VER… #7550, [Package/Build] RemoveSwiftTarget.toolsSwiftVersion
in favor of a build setting #7557Radar: rdar://125732014
Risk: Low
Reviewed By: @MaxDesiatov @bnbarham
Testing: Added new test-cases to the test suite.