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

Upgrade gradle wrapper to version 8.5 for JDK21 support #442

Merged
merged 7 commits into from
Mar 13, 2025

Conversation

chockalingamc
Copy link
Contributor

@chockalingamc chockalingamc commented Mar 12, 2025

Upgrade gradle wrapper to version 8.5 for JDK21 support

Issue #: 332

Description of changes:
In prep for full Java 21 support, gradle needs to be updated to version 8.5 or later.
https://docs.gradle.org/8.5/release-notes.html#java-21
https://docs.gradle.org/8.5/userguide/compatibility.html#java

Note: Tried updating gradle to the latest version available now (8.13), but that failed CI tests with linker errors on legacy platforms (newer GLIBC_2.14 not available in older Ubuntu 10.04 platform). So staying with 8.5 until legacy builds are deprected.

Also upgrading plugin 'com.google.osdetector' to version '1.7.3' to fix gradle deprecation warnings.

(Closed out a old PR #437 related to this and starting clean from latest main branch)

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@chockalingamc chockalingamc requested a review from a team as a code owner March 12, 2025 21:18
@chockalingamc chockalingamc changed the title Upgrade gradle wrapper to latest version (8.13) Upgrade gradle wrapper to latest version (8.5) Mar 13, 2025
build.gradle Outdated
@@ -647,11 +643,23 @@ task coverage {
dependsOn coverage_java_report
}

// Since gradle upgrade to 8.13, Gradle macOS CI workflow fails with this error:
Copy link
Contributor

Choose a reason for hiding this comment

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

Since we're using Gradle 8.5 now, do we still need this workaround? Want to avoid changing anything we don't need to.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will remove for now and add back when upgrading to 8.13

@@ -64,10 +64,30 @@ fi
export JAVA_HOME=$TEST_JAVA_HOME
export PATH=$JAVA_HOME/bin:$PATH

# Since gradle upgrade to 8.13, Gradle macOS CI workflow fails with this error:
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

Chocka Chidambaram added 6 commits March 13, 2025 14:49
In prep for full Java 21 support, gradle needs to be updated to version 8.5 or later.
  https://docs.gradle.org/8.5/release-notes.html#java-21
  https://docs.gradle.org/8.5/userguide/compatibility.html#java

Updating gradle to latest version available now (8.13).
Also upgrading plugin 'com.google.osdetector' to version '1.7.3' to fix gradle deprecation warnings.
This reverts commit 2d3b401.
@chockalingamc chockalingamc changed the title Upgrade gradle wrapper to latest version (8.5) Upgrade gradle wrapper to version 8.5 for JDK21 support Mar 13, 2025
Copy link
Contributor

Choose a reason for hiding this comment

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

nice. thanks for cleaning this up. did recent gradle versions stop writing this JAR? if not, is it something we should add to .gitignore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Every new gradle version should have some update to the wrapper jar. The difference is not visible here, but shows up well in IDE diff. We should keep checking in the updated JAR to git.

@chockalingamc chockalingamc merged commit 7466d79 into corretto:main Mar 13, 2025
11 checks passed
@chockalingamc chockalingamc deleted the gradle_upgrade branch March 13, 2025 20: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.

4 participants