Skip to content
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

8265031: Change default macOS min version for x86_64 to 10.12 and aarch64 to 11.0 #462

Closed
wants to merge 2 commits into from
Closed

8265031: Change default macOS min version for x86_64 to 10.12 and aarch64 to 11.0 #462

wants to merge 2 commits into from

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Apr 12, 2021 •
edited by openjdk bot

As noted in the JBS bug, the minimum macOS version on which JavaFX will run is currently set to 10.10 in mac.gradle. macOS 10.10 is many years out of support, so we should update this minimum. Further, macOS / aarch64 (aka arm64) requires macOS 11.0 as a minimum in order to run.

The JDK recently updated their minimum for x86_64 to 10.12 and for aarch64 to 11.0. See make/autoconf/flags.m4#L136.

This PR will do the same for JavaFX.

To determine whether we are building on aarch64, I check the TARGET_ARCH property for either aarch64 or arm64, since we currently use the latter for our builds, although we should proably update our build to consistently use aarch64 everywhere, and map that to arm64 on usage where required by native tools.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8265031: Change default macOS min version for x86_64 to 10.12 and aarch64 to 11.0

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/462/head:pull/462
$ git checkout pull/462

Update a local copy of the PR:
$ git checkout pull/462
$ git pull https://git.openjdk.java.net/jfx pull/462/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 462

View PR using the GUI difftool:
$ git pr show -t 462

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/462.diff

@kevinrushforth
Copy link
Member Author

/reviewers 2

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 12, 2021

👋 Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Ready for review label Apr 12, 2021
@openjdk
Copy link

openjdk bot commented Apr 12, 2021

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@mlbridge
Copy link

mlbridge bot commented Apr 12, 2021 •
edited

Webrevs

arapte
arapte reviewed Apr 14, 2021
View reviewed changes
buildSrc/mac.gradle Outdated
@@ -55,7 +55,9 @@ def defaultSdkPath = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOS

// Set the minimum API version that we require (developers do not need to override this)
// Note that this is not necessarily the same as the preferred SDK version
defineProperty("MACOSX_MIN_VERSION", "10.10");
def isAarch64 = TARGET_ARCH == "aarch64" || TARGET_ARCH == "arm64";
def macOSMinVersion = (TARGET_ARCH == "aarch64" || TARGET_ARCH == "arm64") ? "11.0" : "10.12";
Copy link
Member

Choose a reason for hiding this comment

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

I guess isAarch64 was defined to use on line 59 in ternary operator.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@openjdk
Copy link

openjdk bot commented Apr 14, 2021 •
edited

@kevinrushforth This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8265031: Change default macOS min version for x86_64 to 10.12 and aarch64 to 11.0

Reviewed-by: jvos, arapte, pbansal

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Apr 14, 2021
@kevinrushforth kevinrushforth mentioned this pull request Apr 14, 2021
Closed
3 tasks
@kevinrushforth
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Apr 14, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Apr 14, 2021
@openjdk
Copy link

openjdk bot commented Apr 14, 2021

@kevinrushforth Pushed as commit e8689fe.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@kevinrushforth kevinrushforth deleted the 8265031-mac-min-version branch April 15, 2021 23:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johanvos johanvos johanvos approved these changes

@pankaj-bansal pankaj-bansal pankaj-bansal approved these changes

@arapte arapte arapte approved these changes

Assignees
No one assigned
Labels
integrated Pull request has been integrated
Milestone
No milestone
4 participants
@kevinrushforth @johanvos @pankaj-bansal @arapte