Skip to content

Commit 76439d9

Browse files
committed
Remove check for old gradle version
see #29681
1 parent d336efc commit 76439d9

File tree

1 file changed

+3
-10
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin

1 file changed

+3
-10
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.gradle.api.tasks.compile.JavaCompile;
4848
import org.gradle.jvm.toolchain.JavaToolchainService;
4949
import org.gradle.jvm.toolchain.JavaToolchainSpec;
50-
import org.gradle.util.GradleVersion;
5150

5251
import org.springframework.boot.gradle.tasks.bundling.BootBuildImage;
5352
import org.springframework.boot.gradle.tasks.bundling.BootJar;
@@ -158,15 +157,9 @@ private void configureBootRunTask(Project project) {
158157
}
159158

160159
private void configureToolchainConvention(Project project, BootRun run) {
161-
if (isGradle67OrLater()) {
162-
JavaToolchainSpec toolchain = project.getExtensions().getByType(JavaPluginExtension.class).getToolchain();
163-
JavaToolchainService toolchainService = project.getExtensions().getByType(JavaToolchainService.class);
164-
run.getJavaLauncher().convention(toolchainService.launcherFor(toolchain));
165-
}
166-
}
167-
168-
private boolean isGradle67OrLater() {
169-
return GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("6.7")) >= 0;
160+
JavaToolchainSpec toolchain = project.getExtensions().getByType(JavaPluginExtension.class).getToolchain();
161+
JavaToolchainService toolchainService = project.getExtensions().getByType(JavaToolchainService.class);
162+
run.getJavaLauncher().convention(toolchainService.launcherFor(toolchain));
170163
}
171164

172165
private JavaPluginConvention javaPluginConvention(Project project) {

0 commit comments

Comments
 (0)