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

7903928: update build.gradle to use JDK 23 #271

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

sundararajana
Copy link
Member

@sundararajana sundararajana commented Jan 9, 2025

We've updated native makefile to use JDK 23 (
0b89a46 )

While build.gradle works & expects jdk 23, it still refers to JDK var as "jdk22_home" and passes --release to be 22. Also jextract version is "22".


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed (no review required)

Issue

  • CODETOOLS-7903928: update build.gradle to use JDK 23 (Bug - P3) ⚠️ Issue is already resolved. Consider making this a "backport pull request" by setting the PR title to Backport <hash> with the hash of the original commit. See Backports.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jextract.git pull/271/head:pull/271
$ git checkout pull/271

Update a local copy of the PR:
$ git checkout pull/271
$ git pull https://git.openjdk.org/jextract.git pull/271/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 271

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jextract/pull/271.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2025

👋 Welcome back sundar! 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 Jan 9, 2025

@sundararajana This change is no longer ready for integration - check the PR body for details.

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 9, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2025

Webrevs

changed Python sample so that it does not fail with unsupported type
_Float16
@@ -29,6 +29,7 @@ def static checkPath(String p) {
}

def llvm_home = project.property("llvm_home")
def jdk_home = project.property("jdk23_home")
Copy link
Member

Choose a reason for hiding this comment

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

We should rename this property simply to jdk_home.

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree. Especially now that we only have one "master" (tip) version.

Copy link
Member Author

Choose a reason for hiding this comment

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

Gradle's jdk is set via JAVA_HOME. It is usual have gradle support for the latest JDK to come bit "late". If we call JDK needed for jextract to be "jdk_Home" and the one needed for gradle as "JAVA_HOME", we may be in a situation where jdk_home points latest JDK (say JDK 25) and JAVA_HOME points whatever then latest Gradle supports. Can we keep jextract use specific JDK version for its build/test as a separately distinctly named variable?

Copy link
Member

Choose a reason for hiding this comment

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

I think you can run gradle's Java compilation and the gradle tool with different JDKs; my previous strategy for running JMH through gradle was to define my local openjdk build as org.gradle.java.home project property, either set in gradle.properties or passed as -Porg.gradle.java.home=xx on command line. JAVA_HOME is used to launch the gradle tool, so it cannot be the local openjdk build, which uses a class file format too new for gradle to generate abstract method implementations.

@Marcono1234
Copy link

The README.md mentions jdk22_home as well and probably needs to be adjusted too.

nizarbenalla pushed a commit to nizarbenalla/jextract that referenced this pull request Jan 21, 2025
@nizarbenalla
Copy link
Member

This PR has been superseded by #275. Please continue the discussion and review there.

@openjdk
Copy link

openjdk bot commented Jan 22, 2025

@sundararajana this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout CODETOOLS-7903928
git fetch https://git.openjdk.org/jextract.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jan 22, 2025
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 18, 2025

@sundararajana This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

6 participants