Update to Gradle 8.6, fix most warnings for Gradle 9 #4693

niloc132 · 2023-10-23T17:10:28Z

This patch cleans up most of our accumulated warnings, updates to Gradle 8.6, and deals with most incoming warnings in anticipating of Gradle 9.

Updates in anticipation of Gradle 8:

Replace Jar.classifier with Jar.artifactClassifier
Replace AbstractArtifactTask.main with JavaExec.mainClass
Drop license plugin
Update Shadow and JHM plugins
Replace Javac CompileOptions.annotationProcessorGeneratedSourcesDirectory with CompileOptions.generatedSourceOutputDirectory
Replace Report.destination with Report.outputLocation
Replace JavaApplication.mainClassName with JavaApplication.mainClass
Make task inputs/outputs explicit for protobuf diff tasks, c++ and r doc tasks

Updates in anticipation of Gradle 9:

Remove all usage of ConfigureUtil.configureUsing
Replace all convention usages with corresponding plugin/extension references
Update Gradle Enterprise plugin
Add test dependencies on junit-platform-launcher instead of implicitly using gradle's copy
Update DiffTask to explicitly list input files

Warnings that are not fixed:

GWT plugin version still produces warnings around use of conventions

Fixes #3642

niloc132 · 2023-10-23T19:10:33Z

Depends on #4692, in draft until that is merged.

Also trying to add spotless magic to handle license headers.

outputs

alexpeters1208

LGTM, only looked at R change

chipkent · 2024-02-20T19:08:57Z

proto/proto-backplane-grpc/build.gradle

@@ -1,5 +1,3 @@
-import nl.javadude.gradle.plugins.license.License


It looks like the license manager gets dropped here. What is going on?

The old license plugin doesn't support newer gradle. We'll instead follow up with another set of changes to update spotless to do this for us, but spotless is very picky, and that also requiring updating basically all of our codegen (at least the codegen that we commit to git, rather than just build as-needed).

OK. Please make certain the new infrastructure for licenses is in place before the next release.

chipkent · 2024-02-20T19:11:15Z

cpp-client/build.gradle

-license {
-    header rootProject.file('license-header')
-    include '**/*.h'
-    include '**/*.cc'
-    strictCheck true
-    useDefaultMappings true
-    ignoreFailures true
-}
-tasks.getByName('license').dependsOn(tasks.create("licensePy", com.hierynomus.gradle.license.tasks.LicenseCheck) {
-    source = ['deephaven']
-})
-tasks.getByName('licenseFormat').dependsOn(tasks.create("licenseFormatPy", com.hierynomus.gradle.license.tasks.LicenseFormat) {
-    source = ['deephaven']
-})
-
-project.tasks.getByName('quick').dependsOn project.tasks.getByName('license')


More license stuff is dropped.

Yep, by design, py/cpp/proto/etc will be managed by spotless once we re-enable that.

chipkent · 2024-02-20T19:12:42Z

buildSrc/src/main/groovy/io.deephaven.python-wheel.gradle

-license {
-    header rootProject.file('license-header')
-    include '**/*.py'
-    strictCheck true
-    useDefaultMappings true
-    ignoreFailures true
-}
-
-tasks.getByName('license').dependsOn(tasks.create("licensePy", com.hierynomus.gradle.license.tasks.LicenseCheck))
-tasks.getByName('licenseFormat').dependsOn(tasks.create("licenseFormatPy", com.hierynomus.gradle.license.tasks.LicenseFormat))
-afterEvaluate {
-    tasks.named("licensePy") { task ->
-        task.source = wheel.src()
-    }
-    tasks.named("licenseFormatPy") { task ->
-        task.source = wheel.src()
-    }
-}
-project.tasks.getByName('quick').dependsOn project.tasks.getByName('license')


More license things removed

chipkent · 2024-02-20T19:13:12Z

buildSrc/src/main/groovy/io.deephaven.java-header-conventions.gradle

-// TODO(deephaven-core#1997): Remove license-gradle-plugin
-plugins {
-    id 'license'
-}
-
-license {
-    header rootProject.file('license-header')
-    include '**/*.java'
-    strictCheck true
-    useDefaultMappings true
-    ignoreFailures true
-}
-
-project.tasks.getByName('quick').dependsOn project.tasks.getByName('license')


More license stuff removed.

chipkent · 2024-02-20T19:13:29Z

buildSrc/src/main/groovy/io.deephaven.deephaven-in-docker.gradle

@@ -1,7 +1,6 @@
 plugins {
    id 'com.bmuschko.docker-remote-api'
    id 'io.deephaven.project.register'
-    id 'license'


More license stuff removed.

chipkent · 2024-02-20T19:14:18Z

buildSrc/build.gradle

-    // TODO(deephaven-core#1997): Remove license-gradle-plugin
-    implementation('gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1') {
-        because('needed by plugin java-header-conventions')
-    }


More license stuff removed.

devinrsmith

This is great; happy to merge asap. Tested locally, everything seemed to work. A few questions around the gradle wrapper that I didn't expect, let's resolve that before merge.

devinrsmith · 2024-02-21T18:59:39Z

buildSrc/src/main/groovy/io.deephaven.java-header-conventions.gradle

I see this file still exists, but is empty. Do we have a ticket for license follow-up? Could drop a link to it in this file.

Good call, I'll make one up and note it here.

Going to repurpose #1997

devinrsmith · 2024-02-21T19:03:35Z

gradlew

Manually verified this is the exact contents I see when creating a new gradle project.

devinrsmith · 2024-02-21T19:07:21Z

gradlew.bat

For some reason, there's a diff between this and what I see in a new gradle project:

$ diff gradlew.bat /tmp/test-project/gradlew.bat 46,50c46,50 < echo. < echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. < echo. < echo Please set the JAVA_HOME variable in your environment to match the < echo location of your Java installation. --- > echo. 1>&2 > echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 > echo. 1>&2 > echo Please set the JAVA_HOME variable in your environment to match the 1>&2 > echo location of your Java installation. 1>&2 60,64c60,64 < echo. < echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% < echo. < echo Please set the JAVA_HOME variable in your environment to match the < echo location of your Java installation. --- > echo. 1>&2 > echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 > echo. 1>&2 > echo Please set the JAVA_HOME variable in your environment to match the 1>&2 > echo location of your Java installation. 1>&2

I now get that as well (but didn't last week), will note more below.

devinrsmith · 2024-02-21T19:12:09Z

gradle/wrapper/gradle-wrapper.jar

I'm seeing a difference here I wouldn't expect. Maybe one of us did something wrong? Hmm...

$ diff -q gradle/wrapper/gradle-wrapper.jar /tmp/test-project/gradle/wrapper/gradle-wrapper.jar Files gradle/wrapper/gradle-wrapper.jar and /tmp/test-project/gradle/wrapper/gradle-wrapper.jar differ $ ls -la gradle/wrapper/gradle-wrapper.jar -rw-r--r--. 1 devin devin 63721 Feb 21 10:55 gradle/wrapper/gradle-wrapper.jar $ ls -la /tmp/test-project/gradle/wrapper/gradle-wrapper.jar -rw-r--r--. 1 devin devin 43462 Feb 21 11:09 /tmp/test-project/gradle/wrapper/gradle-wrapper.jar

I wonder if they continue to update these post-release? I'm specifically running ./gradlew wrapper --gradle-version 8.6, and running that same command two weeks ago vs today is showing these very slightly different results.

The sha256sum did not quite match last time either, but it does now. Perhaps its a question of running the wrapper command using an older gradle version, which updates some aspects, then running it again while using the newer version?

Confirmed, it seems you have to run the above command twice, so that the gradle version changes from the first command, then the second command not only fetches the update (normally this would be your first ./gradlew assemble or whatnot), but updates again and finishes actually replacing files? Seems surprising to me, but not worth spending more time on today.

devinrsmith

LGTM w/ wrapper changes

niloc132 added 14 commits October 23, 2023 11:17

Fix implicit dependencies for generating java

4015042

Remove license plugin

c2bf62c

fix main references

45f0068

Upgrade more deprecated gradle properties

e8c5ad6

Update to Gradle 8.1.1

e745736

re-fix rebase damage

8fb6aed

Remove ConfigureUtil.configureUsing usage

b544069

Update JHM plugin

80ea12c

Phase out conventions in favor of extensions

ff6017f

Update shadow plugin

6b202bb

Update gradle to 8.4

a3acec6

More convention cleanup, import cleanup

842b180

Update enterprise plugin

6af7099

Self-review

38a865e

niloc132 added build NoDocumentationNeeded NoReleaseNotesNeeded No release notes are needed. labels Oct 23, 2023

niloc132 added this to the October 2023 milestone Oct 23, 2023

niloc132 requested a review from devinrsmith October 23, 2023 17:10

niloc132 added 2 commits October 24, 2023 09:47

Merge branch 'main' into gradle-warnings-2

0a4eb2b

Limit source files that Integrations tries to include

b3e4551

pete-petey modified the milestones: October 2023, January 2024 Dec 29, 2023

niloc132 added 6 commits February 15, 2024 12:14

Merge branch 'main' into HEAD

a6f8ee3

Update new codegen

69f8619

Update gradle plugins to better support 8.x

3b05b47

Update go Gradle 8.6

b883810

Fix test gradle wrapper

3f4cdb6

Fix junit platform classpath changes

6ac253f

Change difftask configuration to not confuse gradle with inputs vs

29d8b49

outputs

niloc132 modified the milestones: 1. January 2024 (end of month), 2. February 2024 (end of month) Feb 16, 2024

niloc132 added 3 commits February 17, 2024 12:59

Add task dependency to make Gradle happier with our odd r doc setup

52bbed9

Clarify that this is an ordering issue, not dependency

a856472

Ensure cpp docs are built before next image is made

d2e3235

niloc132 marked this pull request as ready for review February 19, 2024 01:55

niloc132 requested review from chipkent, alexpeters1208, rcaudy, jmao-denver and kosak as code owners February 19, 2024 01:55

alexpeters1208 reviewed Feb 20, 2024

View reviewed changes

chipkent reviewed Feb 20, 2024

View reviewed changes

devinrsmith mentioned this pull request Feb 21, 2024

Improve gradle version management #5177

Closed

devinrsmith requested changes Feb 21, 2024

View reviewed changes

Review feedback, re-update wrapper

f917706

niloc132 changed the title ~~Update to Gradle 8.4, fix most warnings for Gradle 9~~ Update to Gradle 8.6, fix most warnings for Gradle 9 Feb 26, 2024

devinrsmith approved these changes Feb 26, 2024

View reviewed changes

chipkent approved these changes Feb 26, 2024

View reviewed changes

niloc132 merged commit c3d6cdb into deephaven:main Feb 26, 2024
19 checks passed

github-actions bot locked and limited conversation to collaborators Feb 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to Gradle 8.6, fix most warnings for Gradle 9 #4693

Update to Gradle 8.6, fix most warnings for Gradle 9 #4693

niloc132 commented Oct 23, 2023 •

edited

Loading

niloc132 commented Oct 23, 2023

alexpeters1208 left a comment

chipkent Feb 20, 2024

niloc132 Feb 26, 2024

chipkent Feb 26, 2024

chipkent Feb 20, 2024

niloc132 Feb 26, 2024

chipkent Feb 20, 2024

chipkent Feb 20, 2024

chipkent Feb 20, 2024

chipkent Feb 20, 2024

devinrsmith left a comment

devinrsmith Feb 21, 2024

niloc132 Feb 26, 2024

niloc132 Feb 26, 2024

devinrsmith Feb 21, 2024

devinrsmith Feb 21, 2024

niloc132 Feb 26, 2024

devinrsmith Feb 21, 2024

niloc132 Feb 26, 2024

niloc132 Feb 26, 2024

devinrsmith left a comment

		@@ -1,5 +1,3 @@
		import nl.javadude.gradle.plugins.license.License

Update to Gradle 8.6, fix most warnings for Gradle 9 #4693

Update to Gradle 8.6, fix most warnings for Gradle 9 #4693

Conversation

niloc132 commented Oct 23, 2023 • edited Loading

niloc132 commented Oct 23, 2023

alexpeters1208 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devinrsmith left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devinrsmith left a comment

Choose a reason for hiding this comment

niloc132 commented Oct 23, 2023 •

edited

Loading