Backport update to gradle 8.4 (#3632)

gradle/asciidoc.gradle

@@ -40,7 +40,7 @@ configure(rootProject) {
 			}
 
 		}
-		outputDir file("$buildDir/docs/asciidoc/html")
+		outputDir layout.buildDirectory.dir("docs/asciidoc/html").get().asFile
 		logDocuments = true
 		attributes stylesdir: "stylesheets/",
 				stylesheet: 'reactor.css',
@@ -57,7 +57,7 @@ configure(rootProject) {
 			include "index.asciidoc"
 		}
 		baseDirFollowsSourceDir()
-		outputDir file("$buildDir/docs/asciidoc/pdf")
+		outputDir layout.buildDirectory.dir("docs/asciidoc/pdf").get().asFile
 		logDocuments = true
 		attributes 'source-highlighter': 'rouge'
 	}

gradle/javadoc.gradle

@@ -44,7 +44,7 @@ javadoc {
 	classpath += sourceSets.main.compileClasspath
 
 	maxMemory = "1024m"
-	destinationDir = new File(project.buildDir, "docs/javadoc")
+	destinationDir = project.layout.buildDirectory.dir("docs/javadoc").get().asFile
 
 	if (JavaVersion.current().isJava8Compatible()) {
 		options.addStringOption("Xdoclint:none", "-quiet")

gradle/releaser.gradle

@@ -51,7 +51,7 @@ task copyReadme(type: Copy, group: "releaser helpers", description: "copies the
 	from(rootProject.rootDir) {
 		include "README.md"
 	}
-	into rootProject.buildDir
+	into rootProject.layout.buildDirectory.get().asFile.toString()
 }
 
 task bumpVersionsInReadme(type: Copy, group: "releaser helpers", description: "replaces versions in README") {
@@ -66,7 +66,7 @@ task bumpVersionsInReadme(type: Copy, group: "releaser helpers", description: "r
 	doLast {
 		println "Will replace $oldVersion with $currentVersion and $oldSnapshot with $nextVersion"
 	}
-	from(rootProject.buildDir) {
+	from(rootProject.layout.buildDirectory.get().asFile.toString()) {
 		include 'README.md'
 	}
 	into rootProject.rootDir

gradle/setup.gradle

@@ -91,7 +91,7 @@ publishing {
 	repositories {
 		maven {
 			name = "mock"
-			url = "${rootProject.buildDir}/repo"
+			url = "${rootProject.layout.buildDirectory.get().asFile.toString()}/repo"
 		}
 		if (qualifyVersion("$version") == "RELEASE") {
 			maven {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,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/subprojects/plugins/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 +80,11 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,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,11 +198,15 @@ 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"'
+
+# 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" \

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

reactor-core/build.gradle

@@ -186,20 +186,24 @@ def japicmpReport = tasks.register('japicmpReport') {
 		japicmp.state.failure != null
 	}
 	doLast {
-		def reportFile = file("${project.buildDir}/reports/japi.txt")
-		if (reportFile.exists()) {
-			println "\n **********************************"
-			println " * /!\\ API compatibility failures *"
-			println " **********************************"
-			println "Japicmp report was filtered and interpreted to find the following incompatibilities:"
-			reportFile.eachLine {
-				if (it.contains("*") && (!it.contains("***") || it.contains("****")))
-					println "source incompatible change: $it"
-				else if (it.contains("!"))
-					println "binary incompatible change: $it"
-			}
+	  def reportFile = project.layout.buildDirectory.file("reports/japi.txt").get().asFile
+	  if (reportFile.exists()) {
+		println "\n **********************************"
+		println " * /!\\ API compatibility failures *"
+		println " **********************************"
+		println "Japicmp report was filtered and interpreted to find the following incompatibilities:"
+		reportFile.eachLine {
+		  if (it.contains("*") && (!it.contains("***") || it.contains("****"))) {
+			println "source incompatible change: $it"
+		  }
+		  else if (it.contains("!")) {
+			println "binary incompatible change: $it"
+		  }
 		}
-		else println "No incompatible change to report"
+	  }
+	  else {
+		println "No incompatible change to report"
+	  }
 	}
 }
 
@@ -227,7 +231,7 @@ task japicmp(type: JapicmpTask) {
 	onlyModified = true
 	failOnModification = true
 	failOnSourceIncompatibility = true
-	txtOutputFile = file("${project.buildDir}/reports/japi.txt")
+	txtOutputFile = project.layout.buildDirectory.file("reports/japi.txt").get().asFile
 	ignoreMissingClasses = true
 	includeSynthetic = true
 	compatibilityChangeExcludes = [ "METHOD_NEW_DEFAULT" ]
@@ -241,7 +245,7 @@ task japicmp(type: JapicmpTask) {
 gradle.taskGraph.afterTask { task, state ->
 	if (task instanceof JapicmpTask && state.failure && ((JapicmpTask) task).richReport == null) {
 		//FIXME print the rich report somehow on console ?
-		print file("${project.buildDir}/reports/japi.txt").getText()
+		print project.layout.buildDirectory.file("reports/japi.txt").get().asFile.getText()
 	}
 }
 
@@ -256,7 +260,7 @@ javadoc {
 		// work around https://github.com/gradle/gradle/issues/4046
 		copy {
 			from('src/main/java')
-			into "$project.buildDir/docs/javadoc/"
+			into "${project.layout.buildDirectory.dir('/docs/javadoc/').get().asFile.toString()}"
 			include "**/doc-files/**/*"
 		}
 	}

reactor-test/build.gradle

@@ -69,7 +69,7 @@ def japicmpReport = tasks.register('japicmpReport') {
 		japicmp.state.failure != null
 	}
 	doLast {
-		def reportFile = file("${project.buildDir}/reports/japi.txt")
+		def reportFile = project.layout.buildDirectory.file("reports/japi.txt").get().asFile
 		if (reportFile.exists()) {
 			println "\n *********************************"
 			println " * /!\\ API compatibility failures *"
@@ -109,7 +109,7 @@ task japicmp(type: JapicmpTask) {
 	onlyModified = true
 	failOnModification = true
 	failOnSourceIncompatibility = true
-	txtOutputFile = file("${project.buildDir}/reports/japi.txt")
+	txtOutputFile = project.layout.buildDirectory.file("reports/japi.txt").get().asFile
 	ignoreMissingClasses = true
 	includeSynthetic = true
 	compatibilityChangeExcludes = [ "METHOD_NEW_DEFAULT" ]

reactor-tools/build.gradle

@@ -192,7 +192,7 @@ project.tasks.buildPluginTest.mustRunAfter(shadowJar)
 project.tasks.buildPluginTest.dependsOn(shadowJar)
 
 task generateMockGradle(type: Copy) {
-    def coreJar = rootProject.findProject("reactor-core").buildDir.toString() + "/libs/reactor-core-" + version + ".jar"
+    def coreJar = rootProject.findProject("reactor-core").layout.buildDirectory.get().asFile.toString() + "/libs/reactor-core-" + version + ".jar"
     def agentJar = buildDir.toString() + "/libs/reactor-tools-" + version + "-original.jar"
     def mockGradleDir = buildDir.toString() + "/mock-gradle"
 
@@ -208,7 +208,7 @@ task generateMockGradle(type: Copy) {
 }
 
 buildPluginTest {
-    def mockGradleDir = "$buildDir/mock-gradle"
+    def mockGradleDir = layout.buildDirectory.dir("mock-gradle").get().asFile.toString()
     println "will run mock gradle build from $mockGradleDir"
     systemProperty "mock-gradle-dir", mockGradleDir
 }