Add Gradle 8 support

build.gradle

@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
     id "com.peterabeles.gversion" version "1.10.2" apply false
-    id "net.ltgt.errorprone" version "2.0.2" apply false
+    id "net.ltgt.errorprone" version "3.0.1" apply false
     id "com.diffplug.spotless" version "6.9.1" apply false
 }
 
@@ -99,7 +99,7 @@ subprojects {
 
     test {
         useJUnitPlatform()
-        reports.html.enabled = false
+        reports.html.setRequired(false)
         // Make the error logging verbose to make debugging on CI easier
         testLogging.showStandardStreams = true
         testLogging.exceptionFormat TestExceptionFormat.FULL
@@ -145,35 +145,39 @@ subprojects {
         noautoCompileOnly "org.jetbrains:annotations:$project.jetnull_version" // @Nullable
         compileOnly "javax.annotation:jsr250-api:$project.jsr250_version"  // @Generated
 
-        testImplementation("org.junit.jupiter:junit-jupiter-api:$junit_version")
-        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit_version")
+        testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+        testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
-        experimentalImplementation project.sourceSets.main.compileClasspath
-        experimentalImplementation project.sourceSets.main.runtimeClasspath
+        experimentalImplementation project.sourceSets.main.output
+        project.configurations.experimentalImplementation.extendsFrom project.configurations.compileClasspath,
+                project.configurations.runtimeClasspath
 
         testImplementation project.sourceSets.benchmark.output
-        testImplementation project.sourceSets.benchmark.compileClasspath
-        testImplementation project.sourceSets.benchmark.runtimeClasspath
+        project.configurations.testImplementation.extendsFrom project.configurations.benchmarkCompileClasspath,
+                project.configurations.benchmarkRuntimeClasspath
 
         benchmarkImplementation project.sourceSets.experimental.output
         benchmarkImplementation project.sourceSets.generate.output
-        benchmarkImplementation project.sourceSets.main.runtimeClasspath
-        benchmarkImplementation project.sourceSets.main.compileClasspath
+        benchmarkImplementation project.sourceSets.main.output
 
-        benchmarkImplementation("org.openjdk.jmh:jmh-core:$jmh_version")
-        benchmarkAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess:$jmh_version")
+        project.configurations.benchmarkImplementation.extendsFrom project.configurations.compileClasspath,
+                project.configurations.runtimeClasspath
+
+        benchmarkImplementation "org.openjdk.jmh:jmh-core:$jmh_version"
+        benchmarkAnnotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$jmh_version"
 
         // needed to use Java 11+ syntax with Java 1.8 byte code
-        annotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
-        noautoAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
-        testAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
-        benchmarkAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
-        generateAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
+        annotationProcessor "com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}"
+        noautoAnnotationProcessor "com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}"
+        testAnnotationProcessor "com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}"
+        benchmarkAnnotationProcessor "com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}"
+        generateAnnotationProcessor "com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}"
 
         annotationProcessor "org.projectlombok:lombok:${project.lombok_version}"  // @Getter @Setter
         noautoAnnotationProcessor "org.projectlombok:lombok:${project.lombok_version}"  // @Getter @Setter
 
-        errorprone("com.google.errorprone:error_prone_core:$project.errorprone_version")
+        errorprone "com.google.errorprone:error_prone_core:$project.errorprone_version"
 
         // even if it's not used you still need to include the dependency
         annotationProcessor "com.uber.nullaway:nullaway:${project.nullaway_version}"
@@ -491,16 +495,16 @@ task alljavadocWeb() {
 alljavadocWeb.finalizedBy(alljavadoc)
 
 task testReport(type: TestReport) {
-    destinationDir = file("$buildDir/reports/allTests")
+    getDestinationDirectory().set(file("$buildDir/reports/allTests"))
 
     // Android project has a different testing system so skip it
-    reportOn subprojects.findAll {!it.name.contains("android")}.test
+    getTestResults().from(subprojects.findAll {!it.name.contains("android")}.test)
 }
 
 // Sanity check to make sure that autogenerate has been called. This is the source of a lot of confusion from users
 project(":main:boofcv-types") {
     // This is the first task that the main source code will depend on
-    tasks.findByName("compileJava").doFirst { task ->
+    tasks.compileJava.doFirst { task ->
         // Determine the sourceSet by looking at the path
         def iterator = task.stableSources.iterator()
         if (!iterator.hasNext())
@@ -524,5 +528,5 @@ project(":main:boofcv-types") {
 
 wrapper {
     distributionType = Wrapper.DistributionType.BIN
-    gradleVersion = '7.6.4'
+    gradleVersion = '8.10.2'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -32,10 +34,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}.." > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +115,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH=$APP_HOME/lib/gradle-gradle-cli-main-8.10.2.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'" \"-javaagent:$APP_HOME/lib/agents/gradle-instrumentation-agent-8.10.2.jar\""
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        org.gradle.launcher.GradleMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,28 +27,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set APP_HOME=%DIRNAME%..
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" "-javaagent:%APP_HOME%/lib/agents/gradle-instrumentation-agent-8.10.2.jar"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-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
 
 goto fail
 
@@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-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
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\lib\gradle-gradle-cli-main-8.10.2.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.launcher.GradleMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

main/autocode/build.gradle

@@ -14,7 +14,7 @@ gversion {
 }
 
 task(autogenerateDerived, dependsOn: 'classes', type: JavaExec) {
-	main = 'boofcv.AutocodeMasterApp'
+	setMainClass('boofcv.AutocodeMasterApp')
 	classpath = sourceSets.main.runtimeClasspath
 }
 

main/boofcv-core/build.gradle

@@ -14,6 +14,6 @@ dependencies {
 
 // Print out information about dependencies to stdout. Intended use is so we know exactly what CI is running
 task dependencyInfo(type:JavaExec) {
-	main = 'boofcv.PrintDependenciesVersionInfo'
+	setMainClass('boofcv.PrintDependenciesVersionInfo')
 	classpath = sourceSets.main.runtimeClasspath
 }

main/boofcv-ip/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
-	api project(':main:boofcv-types')
-	testImplementation project(':main:boofcv-geo')
+    api project(':main:boofcv-types')
+    testImplementation project(':main:boofcv-geo')
 }
 
 task(autogenerateSource, dependsOn: 'generateClasses', type: JavaExec) {
-	main = 'boofcv.GenerateImageProcessing'
-	classpath = sourceSets.generate.runtimeClasspath
-}
+    setMainClass('boofcv.GenerateImageProcessing')
+    classpath = sourceSets.generate.runtimeClasspath
+}

main/boofcv-types/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-	compileOnly project.sourceSets.noauto.compileClasspath
+	project.configurations.compileOnly.extendsFrom(project.sourceSets.noauto.compileClasspath)
 	implementation project.sourceSets.noauto.runtimeClasspath
-}
+}

main/checks/build.gradle

@@ -29,6 +29,6 @@ task runtimeRegression(type: JavaExec) {
 	group = "Execution"
 	description = "Run the mainClass from the output jar in classpath with ExecTask"
 	classpath = sourceSets.main.runtimeClasspath
-	main = "boofcv.regression.BoofCVRuntimeRegressionApp"
+	setMainClass("boofcv.regression.BoofCVRuntimeRegressionApp")
 	args System.getProperty("exec.args", "").split()
 }