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

Merge branch '2.7.x' into 3.0.x

Browse Source 
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
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) {
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");
}
else {
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileJava", "compileKotlin",
"compileTestKotlin");
}
}
}