Unify argument formatting for add setting and migrate #8800
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.
xedin
requested review from
AnthonyLatsis,
bnbarham,
jakepetroules,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
@swift-ci please test |
dschaefer2
approved these changes
Jun 10, 2025
xedin
added a commit
that referenced
this pull request
Jun 12, 2025
…commands (#8812) Cherry-pick of #8800, #8806 ### Motivation: Fixes for the following problems: - Sometimes if the previous build was unsuccessful subsequent `swift package migrate` invocation fails with `error: did not compute a build plan yet`. - Implicitly generated targets (currently only test targets) are included in migration which results in extraneous warnings and failures (i.e. to update the manifest). 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`: - Rename `--targets` to `--target` - Change `--target` and `--to-feature` to accept space separated argument lists - `swift package -add-setting`: - Switch to `.upToNextOption` formatting. Instead of `--swift A=B --swift C=D` switch to `--swift A=B C=D`. ### Modifications: - Update `Migrate` command's `createBuildSystem` API 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. - Make it possible to mark a `Module` as `implicit` i.e. when it's a synthesized/discovered test target or a system module. - Update `Migrate` command to filter `implicit` modules when no targets are specified by the user. - Update `MigrateOptions` to use `.upToNextOption` for targets and features. - Update `SwiftPackageCommand`'s `_swiftSettings` option to use `.upToNextOption` ### Result: `swift package migrate` is 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
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.
Motivation:
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:
MigrateOptionsto use.upToNextOptionfor targets and features.SwiftPackageCommand's_swiftSettingsoption to use.upToNextOptionResult:
The
swift package migrateandswift package add-settingcommand line is now shorter and has consistent formatting.Resolves: rdar://152687586