Browse Source

Upgrade to Gradle 8.14

pull/45382/head
Andy Wilkinson 8 months ago
parent
commit
c420786eed
  1. BIN
      gradle/wrapper/gradle-wrapper.jar
  2. 2
      gradle/wrapper/gradle-wrapper.properties
  3. 4
      gradlew
  4. 4
      gradlew.bat
  5. 11
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java

BIN
gradle/wrapper/gradle-wrapper.jar vendored

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@ @@ -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

4
gradlew vendored

@ -114,7 +114,7 @@ case "$( uname )" in #( @@ -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"' @@ -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.

4
gradlew.bat vendored

@ -70,11 +70,11 @@ goto fail @@ -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

11
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java

@ -1,5 +1,5 @@ @@ -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,6 +52,7 @@ class KotlinPluginActionIntegrationTests { @@ -52,6 +52,7 @@ class KotlinPluginActionIntegrationTests {
@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]+");
@ -59,6 +60,7 @@ class KotlinPluginActionIntegrationTests { @@ -59,6 +60,7 @@ class KotlinPluginActionIntegrationTests {
@Test
void kotlinCompileTasksUseJavaParametersFlagByDefault() {
expectConfigurationCacheRequestedDeprecationWarning();
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
.contains("compileKotlin java parameters: true")
.contains("compileTestKotlin java parameters: true");
@ -66,6 +68,7 @@ class KotlinPluginActionIntegrationTests { @@ -66,6 +68,7 @@ class KotlinPluginActionIntegrationTests {
@Test
void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() {
expectConfigurationCacheRequestedDeprecationWarning();
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
.contains("compileKotlin java parameters: false")
.contains("compileTestKotlin java parameters: false");
@ -73,6 +76,7 @@ class KotlinPluginActionIntegrationTests { @@ -73,6 +76,7 @@ class KotlinPluginActionIntegrationTests {
@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 @@ class KotlinPluginActionIntegrationTests { @@ -86,4 +90,9 @@ class KotlinPluginActionIntegrationTests {
assertThat(configured).containsExactlyInAnyOrder("help", "compileJava", "clean");
}
private void expectConfigurationCacheRequestedDeprecationWarning() {
this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.14")
.expectDeprecationMessages("The StartParameter.isConfigurationCacheRequested property has been deprecated");
}
}

Loading…
Cancel
Save