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.

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

8240539: Upgrade gradle to version 6.3 #7

Closed
wants to merge 3 commits into from

Conversation

arapte
Copy link
Member

@arapte arapte commented May 7, 2021

jfx11u uses gradle 5.3 for build, it needs to be upgraded to gradle 6.3 same as jfx mainline.
This PR backports three fixes:

  1. JDK-8240539: Upgrade gradle to version 6.3
  2. JDK-8232063: Upgrade gradle to version 6.0 and
  3. JDK-8226754: FX build fails using gradle 5.6+ or 6

All the changes backport cleanly.


Progress

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

Issues

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7

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

Using diff file

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

Remove obsolete STABLE_PUBLISHING; explicitly set output.resourcesDir; bump minimum gradle version to 5.3

Reviewed-by: jvos
@bridgekeeper
Copy link

bridgekeeper bot commented May 7, 2021

👋 Welcome back arapte! 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
Copy link

openjdk bot commented May 7, 2021

⚠️ @arapte could not find any commit with hash d7cab4a02169599043d0024faf62f92d90c48222. Please update the title with the hash for an existing commit.

@arapte arapte changed the title Backport d7cab4a02169599043d0024faf62f92d90c48222 Backport 9ecc10793d0e8b6fdba4e169166389f99334f820 May 7, 2021
@openjdk openjdk bot changed the title Backport 9ecc10793d0e8b6fdba4e169166389f99334f820 8240539: Upgrade gradle to version 6.3 May 7, 2021
@openjdk
Copy link

openjdk bot commented May 7, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Ready for review labels May 7, 2021
@arapte
Copy link
Member Author

arapte commented May 7, 2021

/issue add JDK-8232063, JDK-8226754

@openjdk
Copy link

openjdk bot commented May 7, 2021

@arapte
Adding additional issue to issue list: 8232063: Upgrade gradle to version 6.0.

Adding additional issue to issue list: 8226754: FX build fails using gradle 5.6+ or 6.

@mlbridge
Copy link

mlbridge bot commented May 7, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented May 7, 2021

@arapte 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:

8240539: Upgrade gradle to version 6.3
8232063: Upgrade gradle to version 6.0
8226754: FX build fails using gradle 5.6+ or 6

Reviewed-by: kcr

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 May 7, 2021
@arapte
Copy link
Member Author

arapte commented May 10, 2021

/integrate

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

openjdk bot commented May 10, 2021

@arapte Since your change was applied there has been 1 commit pushed to the master branch:

  • fdd0fa0: 8204568: Relative CSS-Attributes don't work all time

Your commit was automatically rebased without conflicts.

Pushed as commit 6ff7384.

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

@arapte arapte deleted the gradle_upgrade branch August 19, 2021 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants