Use Gradle's CreateStartScripts task with 6.4 and later

Fixes gh-20759
spring-projects · May 6, 2020 · 386d678 · 386d678
1 parent addaf5f
commit 386d678
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/...-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java b/...-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
@@ -36,6 +36,8 @@
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
+import org.gradle.jvm.application.tasks.CreateStartScripts;
+import org.gradle.util.GradleVersion;
 
 import org.springframework.boot.gradle.tasks.application.CreateBootStartScripts;
 
@@ -53,8 +55,8 @@ public void execute(Project project) {
 		DistributionContainer distributions = project.getExtensions().getByType(DistributionContainer.class);
 		Distribution distribution = distributions.create("boot");
 		configureBaseNameConvention(project, applicationConvention, distribution);
-		CreateBootStartScripts bootStartScripts = project.getTasks().create("bootStartScripts",
-				CreateBootStartScripts.class);
+		CreateStartScripts bootStartScripts = project.getTasks().create("bootStartScripts",
+				determineCreateStartScriptsClass());
 		bootStartScripts
 				.setDescription("Generates OS-specific start scripts to run the project as a Spring Boot application.");
 		((TemplateBasedScriptGenerator) bootStartScripts.getUnixStartScriptGenerator())
@@ -79,6 +81,14 @@ public void execute(Project project) {
 		distribution.getContents().with(binCopySpec);
 	}
 
+	private Class<? extends CreateStartScripts> determineCreateStartScriptsClass() {
+		return isGradle64OrLater() ? CreateStartScripts.class : CreateBootStartScripts.class;
+	}
+
+	private boolean isGradle64OrLater() {
+		return GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("6.4")) >= 0;
+	}
+
 	@SuppressWarnings("unchecked")
 	private void configureBaseNameConvention(Project project, ApplicationPluginConvention applicationConvention,
 			Distribution distribution) {

diff --git a/...gin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java b/...gin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
@@ -39,7 +39,7 @@
 public final class GradleCompatibilityExtension implements TestTemplateInvocationContextProvider {
 
 	private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "5.0", "5.1.1", "5.2.1", "5.3.1",
-			"5.4.1", "5.5.1", "5.6.4", "6.0.1", "6.1.1", "6.2.2", "6.3");
+			"5.4.1", "5.5.1", "5.6.4", "6.0.1", "6.1.1", "6.2.2", "6.3", "6.4");
 
 	@Override
 	public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(ExtensionContext context) {

diff --git a/...ces/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.gradle b/...ces/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.gradle
@@ -31,7 +31,7 @@ task('javaCompileEncoding') {
 
 task('startScriptsDefaultJvmOpts') {
 	doFirst {
-		tasks.withType(org.springframework.boot.gradle.tasks.application.CreateBootStartScripts) {
+		tasks.getByName("bootStartScripts") {
 			println "$name defaultJvmOpts = $defaultJvmOpts"
 		}
 	}