[6.2] Fixes a few issues with swift package {migrate, add-setting} commands
#8812
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
- Rename `--targets` to `--target` - Change `--target` and `--to-feature` to accept space separated argument lists
Instead of `--swift A=B --swift C=D` switch to `--swift A=B C=D` to make the command shorter and consistent with `migrate` and in the future other commands.
…ature flags The build system requested by the `swift package migrate` command is transitory and shouldn't be persisted. This would also make sure that the build plan is always available regardless of what builds happened before `swift package migrate` invocation. Resolves: rdar://152687084
It's currently impossible to distringuish between modules that are created from the declarations in a manifest and the ones synthesized as part of module graph building and/or build plan creation. This was only a problem for `SystemLibraryModule` before, but with the introduction of `swift package migrate` command the situation changed because the command can only operate on modules that appear in the manifest file because it won't be possible to update code or settings of the synthesized modules.
Fixes and setting updates to such modules cannot be applied. Resolves: rdar://152689053
xedin
requested review from
AnthonyLatsis,
bkhouri,
bnbarham,
bripeticca,
cmcgee1024,
daveyc123,
dschaefer2,
jakepetroules,
owenv,
plemarquand and
shawnhyam
as code owners
Contributor
Author
|
@swift-ci please test |
bnbarham
approved these changes
Jun 12, 2025
bkhouri
approved these changes
Jun 12, 2025
dschaefer2
pushed a commit
that referenced
this pull request
Jun 14, 2025
…aries (#8825) Cherry-pick of #8824 --- - Explanation: The original check was about system libraries only, the new one filters all of the implicit modules (including snippets) which is incorrect. The is a follow-up to #8812 - Main Branch PR: #8824 - Risk: Low - Reviewed By: @bnbarham - Testing: No testing was added, speculative fix. (cherry picked from commit 68d07f2)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Cherry-pick of #8800, #8806
Motivation:
Fixes for the following problems:
swift package migrateinvocation fails witherror: did not compute a build plan yet.The inconsistency in argument formatting came up as part of SE-0486 review. This is the first step in a direction to make command formatting more consistent.
swift package migrate:--targetsto--target--targetand--to-featureto accept space separated argument listsswift package -add-setting:.upToNextOptionformatting. Instead of--swift A=B --swift C=Dswitch to--swift A=B C=D.Modifications:
Migratecommand'screateBuildSystemAPI to avoid build manifest caching. That ensures that features in migration mode are never persistent and requires a fresh build plan which avoid issues with previous builds.Moduleasimpliciti.e. when it's a synthesized/discovered test target or a system module.Migratecommand to filterimplicitmodules when no targets are specified by the user.MigrateOptionsto use.upToNextOptionfor targets and features.SwiftPackageCommand's_swiftSettingsoption to use.upToNextOptionResult:
swift package migrateis made more stable with fewer unactionable warnings and errors and the command line is now shorter and has consistent formatting.Resolves: rdar://152687586
Resolves: rdar://152689053
Resolves: rdar://152687084