Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x

Browse Source 
Closes gh-37027
This commit is contained in:
Stephane Nicoll
2023-08-18 14:31:51 +02:00
parent 958f92495d 1f6d0600b5
commit d9cc6e810f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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,13 @@ class KotlinPluginActionIntegrationTests {
if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) {
assertThat(configured).containsExactly("help");
}
else {
else if (GradleVersion.version(this.gradleBuild.getGradleVersion())
.compareTo(GradleVersion.version("8.3")) < 0) {
assertThat(configured).containsExactlyInAnyOrder("help", "clean");
}
else {
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileJava");
}
}
}

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

@@ -35,9 +35,9 @@ public final class GradleVersions {
@SuppressWarnings("UnstableApiUsage")
public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_20)) {
return Arrays.asList("8.1.1", "8.2.1");
return Arrays.asList("8.1.1", "8.3");
}
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.3");
}
public static String minimumCompatible() {