Skip to content

Improve handling of minimum deployment target #2719

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 29, 2020

Conversation

neonichu
Copy link
Contributor

Cherry-pick #2710 to the 5.3 branch.

We have a bit of a muddled deployment target situation in 5.2:
- anything declared by SwiftPM's own manifest defaulted to macOS 10.10,
but the toolchain doesn't actually work on macOS < 10.15 anymore
- libPackageDescription was built with minimum deployment target of
10.15, but we were explicitly compiling the manifest for 10.10 minimum
- support for running tests on macOS is aligned with Xcode (so 10.15
minimum), but we were not enforcing that

This change makes it more consistent for 5.3:
- make the deployment target configurable in the manifest, we'll still default to 10.10 but set it to 10.15 in the bootstrap script, so toolchains will end up with a 10.15 minimum deployment target
- build manifests with the same deployment target as `libPackageDescription`, defaulting to 10.15
- always build tests with the minimum deployment target of the corresponding XCTest framework

rdar://problem/62121806

(cherry picked from commit cf6f83c)
@neonichu
Copy link
Contributor Author

@swift-ci please test

Copy link
Contributor

@rballard rballard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was code reviewed in the original PR. Cherry-pick approved for 5.3.

@neonichu neonichu merged commit 2bcd4e5 into swiftlang:release/5.3 Apr 29, 2020
@neonichu neonichu deleted the deployment-target branch April 29, 2020 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants