Merge branch '3.0.x' into 3.1.x

Closes gh-36622

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java

@@ -236,8 +236,8 @@ public class GradleBuild {
 		GradleRunner gradleRunner = GradleRunner.create()
 			.withProjectDir(this.projectDir)
 			.withPluginClasspath(pluginClasspath());
-		if (this.dsl != Dsl.KOTLIN && !this.configurationCache) {
-			// see https://github.com/gradle/gradle/issues/6862
+		if (!this.configurationCache) {
+			// See https://github.com/gradle/gradle/issues/14125
 			gradleRunner.withDebug(true);
 		}
 		if (this.gradleVersion != null) {