[6.2] Cherry-pick of all of the recent swift package migrate related fixes
#8710
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
### Modifications: * Test reorg. * More tests. * When we skip primary diagnostics, skip their notes too. * Skip primary diagnostics with more than 1 note with fix-its. * Deduplicate primary diagnostics. (cherry picked from commit 64b4746)
…g#8677) ### Motivation: If migrate fails to insert one or more features into the manifest for a target, let's produce a single error that lists all of the features, this makes the logging less noisy. ### Modifications: - Update `SwiftPackageCommand` to request manifest to all of the features related to a target and produce a single error if that fails. ### Result: If manifest has some non-standard ways of defining targets or settings that cannot be updated by `AddSettting`, migration logging is going to be more organized and less noisy. (cherry picked from commit 43aa87a)
swiftlang#8700) … module ### Motivation: Previously the feature flags in `:migrate` mode were injected globally into "destination" parameter and affected every module in the graph, this is technically harmless but creates a lot of noise and precludes some of the future optimizations i.e. avoid injecting `@concurrent` into some closure literals when context is already `@concurrent`. Instead of using build parameters, let's make the `Module.buildSettings` mutable in SwiftPM package and inject feature settings directly into `buildSettings` of the user-requested or all root package modules instead. ### Modifications: - Make `Module.buildSettings` to be a `package(set) var` instead of a `let` to allow for mutation my migration command. - Update `Migrate` command to inject the requested upcoming/experimental features in `:migrate` mode only into request targets or all non-plugin modules of root packages. ### Result: No more global build flags and extraneous warnings from dependency modules that shouldn't have migration enabled. (cherry picked from commit 297b487)
…'t walk targets recursively
Otherwise in situations like:
```swift
let package = Package(
name: "packages",
targets: [
.target(
name: "MyTest",
dependencies: [
.byName(name: "Dependency")
]
),
.target(
name: "Dependency"
)
]
)
```
When adding settings to `Dependency` we'd find `.byName(name: "Dependency")`
instead of `.target(name: "Dependency", ...)`.
(cherry picked from commit 612cc07)
xedin
requested review from
jakepetroules,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
@swift-ci please test |
dschaefer2
approved these changes
May 22, 2025
|
@swift-ci please test macOS |
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.
Includes: