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

Merge branch '2.7.x' into 3.0.x 

Closes gh-37026
This commit is contained in:
Stephane Nicoll 2023-08-18 14:15:48 +02:00
parent f3450fde7d 6efd9ed0b0
commit 1f6d0600b5
2 changed files with 8 additions and 3 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");
}
} }
} }

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") @SuppressWarnings("UnstableApiUsage")
public static List<String> allCompatible() { public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_20)) { 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() { public static String minimumCompatible() {