Skip to content

Commit 88ec47f

Browse files
committed
Test Gradle plugin against Gradle 8.1
Closes gh-35034
1 parent 751fc9f commit 88ec47f

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,31 @@ void noKotlinVersionPropertyWithoutKotlinPlugin() {
4848

4949
@TestTemplate
5050
void kotlinVersionPropertyIsSet() {
51-
String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath")
51+
String output = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
52+
.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath")
5253
.getOutput();
5354
assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+");
5455
}
5556

5657
@TestTemplate
5758
void kotlinCompileTasksUseJavaParametersFlagByDefault() {
58-
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
59-
.contains("compileKotlin java parameters: true")
59+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
60+
.build("kotlinCompileTasksJavaParameters")
61+
.getOutput()).contains("compileKotlin java parameters: true")
6062
.contains("compileTestKotlin java parameters: true");
6163
}
6264

6365
@TestTemplate
6466
void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() {
65-
assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput())
66-
.contains("compileKotlin java parameters: false")
67+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1")
68+
.build("kotlinCompileTasksJavaParameters")
69+
.getOutput()).contains("compileKotlin java parameters: false")
6770
.contains("compileTestKotlin java parameters: false");
6871
}
6972

7073
@TestTemplate
7174
void taskConfigurationIsAvoided() throws IOException {
72-
BuildResult result = this.gradleBuild.build("help");
75+
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.1-rc-1").build("help");
7376
String output = result.getOutput();
7477
BufferedReader reader = new BufferedReader(new StringReader(output));
7578
String line;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ private GradleVersions() {
3434

3535
public static List<String> allCompatible() {
3636
if (isJava18()) {
37-
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2");
37+
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.1");
3838
}
3939
if (isJava17()) {
40-
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2");
40+
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.1");
4141
}
4242
if (isJava16()) {
43-
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2");
43+
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.1");
4444
}
45-
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2");
45+
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.1");
4646
}
4747

4848
public static String minimumCompatible() {

0 commit comments

Comments
 (0)