Skip to content

Commit 89a86e9

Browse files
committed
Avoid deprecation warning with Gradle 8.4-rc-1
Closes gh-37493
1 parent f623012 commit 89a86e9

File tree

2 files changed

+11
-5
lines changed
  • spring-boot-project/spring-boot-tools
    • spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo
    • spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit

2 files changed

+11
-5
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.gradle.api.provider.Provider;
2929
import org.gradle.api.tasks.Input;
3030
import org.gradle.api.tasks.Optional;
31+
import org.gradle.util.GradleVersion;
3132

3233
/**
3334
* The properties that are written into the {@code build-info.properties} file.
@@ -38,6 +39,8 @@
3839
@SuppressWarnings("serial")
3940
public class BuildInfoProperties implements Serializable {
4041

42+
private static final GradleVersion GRADLE_7_4 = GradleVersion.version("7.4");
43+
4144
private transient Instant creationTime = Instant.now();
4245

4346
private final Property<String> group;
@@ -74,7 +77,10 @@ private Provider<String> projectVersion(Project project) {
7477

7578
@SuppressWarnings("deprecation")
7679
private Provider<String> forUseAtConfigurationTime(Provider<String> provider) {
77-
return provider.forUseAtConfigurationTime();
80+
if (GradleVersion.current().compareTo(GRADLE_7_4) < 0) {
81+
return provider.forUseAtConfigurationTime();
82+
}
83+
return provider;
7884
}
7985

8086
/**

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ private GradleVersions() {
3434

3535
public static List<String> allCompatible() {
3636
if (isJava18()) {
37-
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.3");
37+
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
3838
}
3939
if (isJava17()) {
40-
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
40+
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
4141
}
4242
if (isJava16()) {
43-
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
43+
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
4444
}
45-
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
45+
return Arrays.asList("6.8.3", "6.9.4", "7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
4646
}
4747

4848
public static String minimumCompatible() {

0 commit comments

Comments
 (0)