Skip to content

Commit d9cc6e8

Browse files
committed
Merge branch '3.0.x' into 3.1.x
Closes gh-37027
2 parents 958f924 + 1f6d060 commit d9cc6e8

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,13 @@ 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");
9091
}
92+
else {
93+
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileJava");
94+
}
9195
}
9296

9397
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ private GradleVersions() {
3535
@SuppressWarnings("UnstableApiUsage")
3636
public static List<String> allCompatible() {
3737
if (isJavaVersion(JavaVersion.VERSION_20)) {
38-
return Arrays.asList("8.1.1", "8.2.1");
38+
return Arrays.asList("8.1.1", "8.3");
3939
}
40-
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
40+
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.3");
4141
}
4242

4343
public static String minimumCompatible() {

0 commit comments

Comments
 (0)