Migrate deprecated buildDir usages (#1809)

Author: nedtwigg

plugin-gradle/README.md

@@ -1243,7 +1243,7 @@ To use a fixed binary, omit the `version` and specify a `pathToExe`:
 spotless {
   format 'rome', {
     target '**/*.js','**/*.ts','**/*.json'
-    rome().pathToExe("${project.buildDir.absolutePath}/bin/rome")
+    rome().pathToExe("${project.layout.buildDirectory.asFile.get().absolutePath}/bin/rome")
   }
 }
 ```

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

@@ -280,9 +280,9 @@ private final FileCollection parseTargetIsExclude(Object target, boolean isExclu
 					excludes.add(".gradle");
 				}
 				// no build folders (flatInclude means that subproject might not be subfolders, see https://github.com/diffplug/spotless/issues/121)
-				relativizeIfSubdir(excludes, dir, getProject().getBuildDir());
+				relativizeIfSubdir(excludes, dir, getProject().getLayout().getBuildDirectory().getAsFile().get());
 				for (Project subproject : getProject().getSubprojects()) {
-					relativizeIfSubdir(excludes, dir, subproject.getBuildDir());
+					relativizeIfSubdir(excludes, dir, subproject.getLayout().getBuildDirectory().getAsFile().get());
 				}
 				matchedFiles.exclude(excludes);
 			}
@@ -606,7 +606,7 @@ public T npmInstallCache(final Object npmInstallCache) {
 		}
 
 		public T npmInstallCache() {
-			this.npmInstallCache = new File(project.getBuildDir(), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
+			this.npmInstallCache = new File(project.getLayout().getBuildDirectory().getAsFile().get(), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
 			replaceStep();
 			return (T) this;
 		}
@@ -673,7 +673,7 @@ protected FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					new com.diffplug.spotless.npm.PrettierConfig(

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java

@@ -107,7 +107,7 @@ public FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java

@@ -68,7 +68,7 @@ void setup() {
 		taskService = buildServices.registerIfAbsent("SpotlessTaskService" + compositeBuildSuffix, SpotlessTaskService.class, spec -> {});
 		usesService(taskService);
 		getBuildEventsListenerRegistry().onTaskCompletion(taskService);
-		unitOutput = new File(getProject().getBuildDir(), "tmp/spotless-register-dependencies");
+		unitOutput = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(), "tmp/spotless-register-dependencies");
 	}
 
 	List<FormatterStep> steps = new ArrayList<>();

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,8 @@ public SpotlessTask getSource() {
 	@SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
 	public void performAction() throws IOException {
 		Path srcRoot = getProject().getProjectDir().toPath();
-		Path diagnoseRoot = getProject().getBuildDir().toPath().resolve("spotless-diagnose-" + source.formatName());
+		Path diagnoseRoot = getProject().getLayout().getBuildDirectory().getAsFile().get()
+				.toPath().resolve("spotless-diagnose-" + source.formatName());
 		getProject().delete(diagnoseRoot.toFile());
 		try (Formatter formatter = source.buildFormatter()) {
 			for (File file : source.target) {

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java

@@ -148,7 +148,7 @@ public void setTarget(Iterable<File> target) {
 		}
 	}
 
-	protected File outputDirectory = new File(getProject().getBuildDir(), "spotless/" + getName());
+	protected File outputDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(), "spotless/" + getName());
 
 	@OutputDirectory
 	public File getOutputDirectory() {

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java

@@ -118,7 +118,7 @@ public FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					typedConfigFile(),
@@ -215,7 +215,7 @@ public FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());