Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Test Gradle plugin against Gradle 8.3

Browse Source 
Closes gh-37025
This commit is contained in:
Stephane Nicoll 2023-08-18 14:05:50 +02:00
parent 3920f97aa1
commit 6efd9ed0b0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,9 +85,14 @@ class KotlinPluginActionIntegrationTests {
if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) { if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) {
assertThat(configured).containsExactly("help"); assertThat(configured).containsExactly("help");
} }
else { else if (GradleVersion.version(this.gradleBuild.getGradleVersion())
.compareTo(GradleVersion.version("8.3")) < 0) {
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileKotlin", "compileTestKotlin"); assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileKotlin", "compileTestKotlin");
} }
else {
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileJava", "compileKotlin",
"compileTestKotlin");
}
} }
} }

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() { public static List<String> allCompatible() {
if (isJava18()) { if (isJava18()) {
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.2.1"); return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.3");
} }
if (isJava17()) { if (isJava17()) {
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1"); return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
} }
if (isJava16()) { if (isJava16()) {
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1"); return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
} }
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1"); return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
} }
public static String minimumCompatible() { public static String minimumCompatible() {