Use project.getLayout().getBuildDirectory() instead of getBuildDir()

quaff · wilkinsona · commit a8706962d451 · 2023-09-01T14:08:16.000+01:00
See gh-37167
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.gradle.plugin;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
@@ -79,7 +78,7 @@ private void configureCreateStartScripts(Project project, JavaApplication javaAp
 			}
 		});
 		createStartScripts.getConventionMapping()
-			.map("outputDir", () -> new File(project.getBuildDir(), "bootScripts"));
+			.map("outputDir", () -> project.getLayout().getBuildDirectory().dir("bootScripts").get().getAsFile());
 		createStartScripts.getConventionMapping().map("applicationName", javaApplication::getApplicationName);
 		createStartScripts.getConventionMapping().map("defaultJvmOpts", javaApplication::getApplicationDefaultJvmArgs);
 	}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`package org.springframework.boot.gradle.plugin;`
`18`	`18`
`19`		`-import java.io.File;`
`20`	`19`	`import java.io.IOException;`
`21`	`20`	`import java.io.InputStreamReader;`
`22`	`21`	`import java.io.StringWriter;`
`@@ -79,7 +78,7 @@ private void configureCreateStartScripts(Project project, JavaApplication javaAp`
`79`	`78`	`}`
`80`	`79`	`});`
`81`	`80`	`createStartScripts.getConventionMapping()`
`82`		`- .map("outputDir", () -> new File(project.getBuildDir(), "bootScripts"));`
	`81`	`+ .map("outputDir", () -> project.getLayout().getBuildDirectory().dir("bootScripts").get().getAsFile());`
`83`	`82`	`createStartScripts.getConventionMapping().map("applicationName", javaApplication::getApplicationName);`
`84`	`83`	`createStartScripts.getConventionMapping().map("defaultJvmOpts", javaApplication::getApplicationDefaultJvmArgs);`
`85`	`84`	`}`