From b42425458701172bc81f64af64daa36735a0e701 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 5 Dec 2023 20:30:54 +0000 Subject: [PATCH] Test Gradle plugin against Gradle 8.5 Closes gh-38664 --- .../tasks/bundling/AbstractBootArchiveIntegrationTests.java | 3 +++ .../boot/testsupport/gradle/testkit/GradleVersions.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java index fa1b22e88a2..42a4f991815 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java @@ -605,6 +605,9 @@ abstract class AbstractBootArchiveIntegrationTests { try (PrintWriter writer = new PrintWriter( new FileWriter(new File(this.gradleBuild.getProjectDir(), "settings.gradle")))) { writer.println("include 'alpha', 'bravo', 'charlie'"); + new File(this.gradleBuild.getProjectDir(), "alpha").mkdirs(); + new File(this.gradleBuild.getProjectDir(), "bravo").mkdirs(); + new File(this.gradleBuild.getProjectDir(), "charlie").mkdirs(); } catch (IOException ex) { throw new RuntimeException(ex); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java index a5031c7e744..0a4049a6950 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java @@ -35,9 +35,9 @@ public final class GradleVersions { @SuppressWarnings("UnstableApiUsage") public static List allCompatible() { if (isJavaVersion(JavaVersion.VERSION_20)) { - return Arrays.asList("8.1.1", "8.3", "8.4"); + return Arrays.asList("8.1.1", "8.5"); } - return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4"); + return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.5"); } public static String minimumCompatible() {