root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Test Gradle plugin against Gradle 8.1 

Closes gh-35034
This commit is contained in:
Andy Wilkinson 2023-03-28 17:41:21 +01:00
parent 751fc9fe54
commit 88ec47ff2b
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
View File

@ -48,28 +48,31 @@ class KotlinPluginActionIntegrationTests {
@TestTemplate
void kotlinVersionPropertyIsSet() {
String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath")
String output = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath")
.getOutput();
assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+");
}
@TestTemplate
void kotlinCompileTasksUseJavaParametersFlagByDefault() {
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
.contains("compileKotlin java parameters: true")
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
.build("kotlinCompileTasksJavaParameters")
.getOutput()).contains("compileKotlin java parameters: true")
.contains("compileTestKotlin java parameters: true");
}
@TestTemplate
void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() {
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
.contains("compileKotlin java parameters: false")
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
.build("kotlinCompileTasksJavaParameters")
.getOutput()).contains("compileKotlin java parameters: false")
.contains("compileTestKotlin java parameters: false");
}
@TestTemplate
void taskConfigurationIsAvoided() throws IOException {
BuildResult result = this.gradleBuild.build("help");
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1").build("help");
String output = result.getOutput();
BufferedReader reader = new BufferedReader(new StringReader(output));
String line;

8
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
View File

@ -34,15 +34,15 @@ public final class GradleVersions {
public static List<String> allCompatible() {
if (isJava18()) {
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2");
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.1");
}
if (isJava17()) {
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2");
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.1");
}
if (isJava16()) {
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2");
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.1");
}
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2");
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.1");
}
public static String minimumCompatible() {