Merge branch '3.0.x' into 3.1.x

Closes gh-37027
This commit is contained in:
Stephane Nicoll
2023-08-18 14:31:51 +02:00
2 changed files with 7 additions and 3 deletions

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");
}
}
}