Skip to content

Commit 6efd9ed

Browse files
committed
Test Gradle plugin against Gradle 8.3
Closes gh-37025
1 parent 3920f97 commit 6efd9ed

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,14 @@ void taskConfigurationIsAvoided() throws IOException {
8585
if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) {
8686
assertThat(configured).containsExactly("help");
8787
}
88-
else {
88+
else if (GradleVersion.version(this.gradleBuild.getGradleVersion())
89+
.compareTo(GradleVersion.version("8.3")) < 0) {
8990
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileKotlin", "compileTestKotlin");
9091
}
92+
else {
93+
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileJava", "compileKotlin",
94+
"compileTestKotlin");
95+
}
9196
}
9297

9398
}

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", "8.2.1");
37+
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.3");
3838
}
3939
if (isJava17()) {
40-
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
40+
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
4141
}
4242
if (isJava16()) {
43-
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
43+
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
4444
}
45-
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
45+
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
4646
}
4747

4848
public static String minimumCompatible() {

0 commit comments

Comments
 (0)