Skip to content

[5.5] Add Mac Catalyst as a supported platform #3444

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 27, 2021
Merged

[5.5] Add Mac Catalyst as a supported platform #3444

merged 1 commit into from
Apr 27, 2021

Conversation

jakepetroules
Copy link
Contributor

This adds Mac Catalyst as a support platform, so that a minimum deployment target can be specified and conditional build settings can be configured.

(just like the earlier DriverKit patch)

rdar://60376383

@jakepetroules jakepetroules changed the base branch from main to release/5.5 April 25, 2021 23:19
@jakepetroules
Copy link
Contributor Author

@swift-ci please smoke test

neonichu
neonichu reviewed Apr 26, 2021
View reviewed changes
Copy link
Contributor

@neonichu neonichu left a comment

Choose a reason for hiding this comment

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

I think we need Target.deploymentTarget(for:) to return the iOS deployment target if that has been customized to > 13 but the MacCatalyst target has not been customized separately. That should also take care of backwards compatibility for pre-5.5 tools versions.

@jakepetroules
Copy link
Contributor Author

@swift-ci please test

@neonichu
Copy link
Contributor

Looks good to me, thanks for the PR!

@jakepetroules
Copy link
Contributor Author

@swift-ci please test

@abertelrud
Copy link
Contributor

This makes sense to me as well — I don't know the details here as well as @neonichu but looked over the diffs and they all make sense to me as well.

@jakepetroules
Copy link
Contributor Author

@swift-ci please test linux

@tomerd tomerd added the 5.5 label Apr 27, 2021
@tomerd
Copy link
Contributor

tomerd commented Apr 27, 2021 •
edited
Loading

@jakepetroules is this the same as #3450? if so lets have that merged first then this one

@tomerd tomerd changed the title Add Mac Catalyst as a supported platform [5.5] Add Mac Catalyst as a supported platform Apr 27, 2021
@jakepetroules
Copy link
Contributor Author

@jakepetroules is this the same as #3450? if so lets have that merged first then this one

Yep. And done!

@jakepetroules jakepetroules merged commit 07e808e into release/5.5 Apr 27, 2021
@jakepetroules jakepetroules deleted the 60376383 branch April 27, 2021 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neonichu neonichu neonichu approved these changes

@tomerd tomerd Awaiting requested review from tomerd

@abertelrud abertelrud Awaiting requested review from abertelrud abertelrud is a code owner

@friedbunny friedbunny Awaiting requested review from friedbunny friedbunny is a code owner

Assignees

@jakepetroules jakepetroules

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jakepetroules @neonichu @abertelrud @tomerd