Merge branch '3.4.x'

Author: wilkinsona

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @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%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,27 +52,31 @@ void noKotlinVersionPropertyWithoutKotlinPlugin() {
 
 	@Test
 	void kotlinVersionPropertyIsSet() {
+		expectConfigurationCacheRequestedDeprecationWarning();
 		String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath")
 			.getOutput();
 		assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+");
 	}
 
 	@Test
 	void kotlinCompileTasksUseJavaParametersFlagByDefault() {
+		expectConfigurationCacheRequestedDeprecationWarning();
 		assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
 			.contains("compileKotlin java parameters: true")
 			.contains("compileTestKotlin java parameters: true");
 	}
 
 	@Test
 	void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() {
+		expectConfigurationCacheRequestedDeprecationWarning();
 		assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
 			.contains("compileKotlin java parameters: false")
 			.contains("compileTestKotlin java parameters: false");
 	}
 
 	@Test
 	void taskConfigurationIsAvoided() throws IOException {
+		expectConfigurationCacheRequestedDeprecationWarning();
 		BuildResult result = this.gradleBuild.build("help");
 		String output = result.getOutput();
 		BufferedReader reader = new BufferedReader(new StringReader(output));
@@ -86,4 +90,9 @@ void taskConfigurationIsAvoided() throws IOException {
 		assertThat(configured).containsExactlyInAnyOrder("help", "compileJava", "clean");
 	}
 
+	private void expectConfigurationCacheRequestedDeprecationWarning() {
+		this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.14")
+			.expectDeprecationMessages("The StartParameter.isConfigurationCacheRequested property has been deprecated");
+	}
+
 }