Skip to content

[5.5] Fix a problem in the logic to generate manifest source from existing parsed manifest structs #3422

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
merged 1 commit into from
Apr 21, 2021

Conversation

abertelrud
Copy link
Contributor

This is the 5.5 nomination of #3415 which fixes a problem serializing package manifests with ranged package dependencies.

…ata structures misquoted some package version requirement ranges. (swiftlang#3415)

This fixes those cases, producing a semantically equivalent package manifests.  Since the model does not capture how a particular range was specified, it is not possible to recreate the original shorthands.

A future improvement can either extend the model to record the original spelling of the range requirements, or can apply heuristics to shorten the rules in the future (e.g. automatically derive `upToNextMajor()` etc.

This also eliminates an extra whitespace before the minimum tools version declaration when the specified tools version allows it, so older parsers can parse the generated manifests.

rdar://76559428
(cherry picked from commit 8ee8d40)
@abertelrud abertelrud changed the base branch from main to release/5.5 April 21, 2021 02:01
@abertelrud abertelrud self-assigned this Apr 21, 2021
@abertelrud abertelrud added 5.5 ready Author believes the PR is ready to be merged & any feedback has been addressed labels Apr 21, 2021
@abertelrud
Copy link
Contributor Author

@swift-ci please test

@abertelrud abertelrud merged commit 15f716a into swiftlang:release/5.5 Apr 21, 2021
@abertelrud abertelrud deleted the eng/5.5/76559428 branch April 21, 2021 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready Author believes the PR is ready to be merged & any feedback has been addressed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants