Test Gradle plugin against Gradle 8.3

Closes gh-37025
spring-projects · Aug 18, 2023 · 6efd9ed · 6efd9ed
1 parent 3920f97
commit 6efd9ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.../test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/.../test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
@@ -85,9 +85,14 @@ void taskConfigurationIsAvoided() throws IOException {
 		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");
+		}
 	}
 
 }
diff --git a/...ort/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/...ort/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
@@ -34,15 +34,15 @@ private GradleVersions() {
 
 	public static List<String> allCompatible() {
 		if (isJava18()) {
-			return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
+			return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.3");
 		}
 		if (isJava17()) {
-			return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
+			return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
 		}
 		if (isJava16()) {
-			return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
+			return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
 		}
-		return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
+		return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
 	}
 
 	public static String minimumCompatible() {