Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid deprecation warning with Gradle 8.4-rc-1

Browse Source 
Closes gh-37493
This commit is contained in:
Andy Wilkinson 2023-09-20 14:39:48 +01:00
parent f6230120dc
commit 89a86e91f5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import org.gradle.api.provider.Property;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.Optional;
import org.gradle.util.GradleVersion;
/**
* The properties that are written into the {@code build-info.properties} file.
@ -38,6 +39,8 @@ import org.gradle.api.tasks.Optional;
@SuppressWarnings("serial")
public class BuildInfoProperties implements Serializable {
private static final GradleVersion GRADLE_7_4 = GradleVersion.version("7.4");
private transient Instant creationTime = Instant.now();
private final Property<String> group;
@ -74,7 +77,10 @@ public class BuildInfoProperties implements Serializable {
@SuppressWarnings("deprecation")
private Provider<String> forUseAtConfigurationTime(Provider<String> provider) {
return provider.forUseAtConfigurationTime();
if (GradleVersion.current().compareTo(GRADLE_7_4) < 0) {
return provider.forUseAtConfigurationTime();
}
return provider;
}
/**

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

@ -34,15 +34,15 @@ public final class GradleVersions {
public static List<String> allCompatible() {
if (isJava18()) {
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.3");
return Arrays.asList("7.3.3", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
}
if (isJava17()) {
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
return Arrays.asList("7.2", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
}
if (isJava16()) {
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3");
return Arrays.asList("7.0.2", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4-rc-1");
}
return Arrays.asList("6.8.3", "6.9.4", "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.3", "8.4-rc-1");
}
public static String minimumCompatible() {