Skip to content

Commit ce106eb

Browse files
mhalbrittermhalbritter
committed
Remove calls to deprecated Project.getBuildDir() in Gradle files
Closes gh-42739
1 parent a48dfbd commit ce106eb

File tree

16 files changed

+64
-63
lines changed

16 files changed

+64
-63
lines changed

‎buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
import org.gradle.api.DefaultTask;
3232
import org.gradle.api.Task;
33+
import org.gradle.api.file.DirectoryProperty;
3334
import org.gradle.api.file.FileCollection;
34-
import org.gradle.api.file.RegularFileProperty;
3535
import org.gradle.api.tasks.InputFiles;
3636
import org.gradle.api.tasks.OutputDirectory;
3737
import org.gradle.api.tasks.TaskAction;
@@ -57,7 +57,7 @@ public void setAutoConfiguration(FileCollection autoConfiguration) {
5757
}
5858

5959
@OutputDirectory
60-
public abstract RegularFileProperty getOutputDir();
60+
public abstract DirectoryProperty getOutputDir();
6161

6262
@TaskAction
6363
void documentAutoConfigurationClasses() throws IOException {

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def documentationTest = tasks.register("documentationTest", Test) {
240240
includeTestsMatching("org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.*")
241241
}
242242
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
243-
outputs.dir("${buildDir}/generated-snippets")
243+
outputs.dir(layout.buildDirectory.dir("generated-snippets"))
244244
develocity {
245245
predictiveTestSelection {
246246
enabled = false
@@ -261,5 +261,5 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
261261
attributes "spring-integration-docs": integrationDocs
262262
}
263263
dependsOn documentationTest
264-
inputs.dir("${buildDir}/generated-snippets").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("generatedSnippets")
264+
inputs.dir(layout.buildDirectory.dir("generated-snippets")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("generatedSnippets")
265265
}

‎spring-boot-project/spring-boot-devtools/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ dependencies {
8484
}
8585

8686
task syncIntTestDependencies(type: Sync) {
87-
destinationDir = file("${buildDir}/dependencies")
87+
destinationDir = file(layout.buildDirectory.dir("dependencies"))
8888
from {
8989
configurations.intTestDependencies
9090
}

‎spring-boot-project/spring-boot-docs/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ task aggregatedJavadoc(type: Javadoc) {
220220
dependsOn publishedProjects.javadoc
221221
source publishedProjects.javadoc.source
222222
classpath = project.files(publishedProjects.javadoc.classpath)
223-
destinationDir = project.file "${buildDir}/docs/javadoc"
223+
destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))
224224
options {
225225
author = true
226226
docTitle = "Spring Boot ${project.version} API"
@@ -253,33 +253,33 @@ task aggregatedJavadoc(type: Javadoc) {
253253

254254
task documentTestSlices(type: org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) {
255255
testSlices = configurations.testSlices
256-
outputFile = file("${buildDir}/docs/generated/test-auto-configuration/documented-slices.adoc")
256+
outputFile = layout.buildDirectory.file("docs/generated/test-auto-configuration/documented-slices.adoc")
257257
}
258258

259259
task documentStarters(type: org.springframework.boot.build.starters.DocumentStarters) {
260-
outputDir = file("${buildDir}/docs/generated/using/starters/")
260+
outputDir = layout.buildDirectory.dir("docs/generated/using/starters/")
261261
}
262262

263263
task documentAutoConfigurationClasses(type: org.springframework.boot.build.autoconfigure.DocumentAutoConfigurationClasses) {
264264
autoConfiguration = configurations.autoConfiguration
265-
outputDir = file("${buildDir}/docs/generated/auto-configuration-classes/documented-auto-configuration-classes/")
265+
outputDir = layout.buildDirectory.dir("docs/generated/auto-configuration-classes/documented-auto-configuration-classes/")
266266
}
267267

268268
task documentDependencyVersions(type: org.springframework.boot.build.constraints.DocumentConstrainedVersions) {
269269
dependsOn dependencyVersions
270270
constrainedVersions.set(providers.provider { dependencyVersions.constrainedVersions })
271-
outputFile = file("${buildDir}/docs/generated/dependency-versions/documented-coordinates.adoc")
271+
outputFile = layout.buildDirectory.file("docs/generated/dependency-versions/documented-coordinates.adoc")
272272
}
273273

274274
task documentVersionProperties(type: org.springframework.boot.build.constraints.DocumentVersionProperties) {
275275
dependsOn dependencyVersions
276276
versionProperties.set(providers.provider { dependencyVersions.versionProperties})
277-
outputFile = file("${buildDir}/docs/generated/dependency-versions/documented-properties.adoc")
277+
outputFile = layout.buildDirectory.file("docs/generated/dependency-versions/documented-properties.adoc")
278278
}
279279

280280
task documentConfigurationProperties(type: org.springframework.boot.build.context.properties.DocumentConfigurationProperties) {
281281
configurationPropertyMetadata = configurations.configurationProperties
282-
outputDir = file("${buildDir}/docs/generated/")
282+
outputDir = layout.buildDirectory.dir("docs/generated/")
283283
}
284284

285285
task documentDevtoolsPropertyDefaults(type: org.springframework.boot.build.devtools.DocumentDevtoolsPropertyDefaults) {}
@@ -288,7 +288,7 @@ task runRemoteSpringApplicationExample(type: org.springframework.boot.build.docs
288288
classpath = configurations.remoteSpringApplicationExample
289289
mainClass = "org.springframework.boot.devtools.RemoteSpringApplication"
290290
args = ["https://myapp.example.com", "--spring.devtools.remote.secret=secret", "--spring.devtools.livereload.port=0"]
291-
output = file("$buildDir/example-output/remote-spring-application.txt")
291+
output = layout.buildDirectory.file("example-output/remote-spring-application.txt")
292292
expectedLogging = "Started RemoteSpringApplication in "
293293
applicationJar = "/Users/myuser/.m2/repository/org/springframework/boot/spring-boot-devtools/${project.version}/spring-boot-devtools-${project.version}.jar"
294294
normalizeLiveReloadPort()
@@ -298,7 +298,7 @@ task runSpringApplicationExample(type: org.springframework.boot.build.docs.Appli
298298
classpath = configurations.springApplicationExample + sourceSets.main.output
299299
mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
300300
args = ["--server.port=0"]
301-
output = file("$buildDir/example-output/spring-application.txt")
301+
output = layout.buildDirectory.file("example-output/spring-application.txt")
302302
expectedLogging = "Started MyApplication in "
303303
normalizeTomcatPort()
304304
}
@@ -307,7 +307,7 @@ task runLoggingFormatExample(type: org.springframework.boot.build.docs.Applicati
307307
classpath = configurations.springApplicationExample + sourceSets.main.output
308308
mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
309309
args = ["--spring.main.banner-mode=off", "--server.port=0", "--spring.application.name=myapp"]
310-
output = file("$buildDir/example-output/logging-format.txt")
310+
output = layout.buildDirectory.file("example-output/logging-format.txt")
311311
expectedLogging = "Started MyApplication in "
312312
normalizeTomcatPort()
313313
}
@@ -398,7 +398,7 @@ syncDocumentationSourceForAsciidoctor {
398398
dependsOn documentVersionProperties
399399
dependsOn documentConfigurationProperties
400400
dependsOn documentDevtoolsPropertyDefaults
401-
from("${buildDir}/docs/generated") {
401+
from(layout.buildDirectory.dir("docs/generated")) {
402402
into "asciidoc"
403403
}
404404
from("src/main/java") {
@@ -426,7 +426,7 @@ syncDocumentationSourceForAsciidoctorMultipage {
426426
dependsOn documentVersionProperties
427427
dependsOn documentConfigurationProperties
428428
dependsOn documentDevtoolsPropertyDefaults
429-
from("${buildDir}/docs/generated") {
429+
from(layout.buildDirectory.dir("docs/generated")) {
430430
into "asciidoc"
431431
}
432432
from("src/main/java") {
@@ -454,7 +454,7 @@ syncDocumentationSourceForAsciidoctorPdf {
454454
dependsOn documentVersionProperties
455455
dependsOn documentConfigurationProperties
456456
dependsOn documentDevtoolsPropertyDefaults
457-
from("${buildDir}/docs/generated") {
457+
from(layout.buildDirectory.dir("docs/generated")) {
458458
into "asciidoc"
459459
}
460460
from("src/main/java") {

‎spring-boot-project/spring-boot-test-autoconfigure/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,5 @@ test {
130130

131131
task testSliceMetadata(type: org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) {
132132
sourceSet = sourceSets.main
133-
outputFile = file("${buildDir}/test-slice-metadata.properties")
133+
outputFile = layout.buildDirectory.file("test-slice-metadata.properties")
134134
}

‎spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
}
2727

2828
task syncIntegrationTestSources(type: Sync) {
29-
destinationDir file("${buildDir}/it")
29+
destinationDir file(layout.buildDirectory.dir("it"))
3030
from file("src/it")
3131
filter(springRepositoryTransformers.ant())
3232
}
@@ -40,7 +40,7 @@ processResources {
4040

4141
task integrationTest {
4242
dependsOn syncIntegrationTestSources, jar
43-
def resultsDir = file("${buildDir}/test-results/integrationTest")
43+
def resultsDir = file(layout.buildDirectory.dir("test-results/integrationTest"))
4444
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")
4545
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer).withPropertyName("classpath")
4646
outputs.dirs resultsDir
@@ -62,9 +62,9 @@ task integrationTest {
6262
ant.propertyref(name: "ivy.class.path")
6363
}
6464
plainlistener()
65-
file("${buildDir}/test-results/integrationTest").mkdirs()
65+
file(layout.buildDirectory.dir("test-results/integrationTest")).mkdirs()
6666
xmllistener(toDir: resultsDir)
67-
fileset(dir: "${buildDir}/it", includes: "**/build.xml")
67+
fileset(dir: layout.buildDirectory.dir("it").get().asFile.toString(), includes: "**/build.xml")
6868
}
6969
}
7070
}

‎spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ task tar(type: Tar) {
106106

107107
task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
108108
dependsOn tar
109-
outputDir = file("${buildDir}/homebrew")
109+
outputDir = layout.buildDirectory.dir("homebrew")
110110
template = file("src/main/homebrew/spring-boot.rb")
111111
archive = tar.archiveFile
112112
}
113113

114-
def homebrewFormulaArtifact = artifacts.add("archives", file("${buildDir}/homebrew/spring-boot.rb")) {
114+
def homebrewFormulaArtifact = artifacts.add("archives", file(layout.buildDirectory.file("homebrew/spring-boot.rb"))) {
115115
type "rb"
116116
classifier "homebrew"
117117
builtBy "homebrewFormula"

‎spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
description = "Spring Boot Loader Tools"
77

8-
def generatedResources = "${buildDir}/generated-resources/main"
8+
Provider<Directory> generatedResources = layout.buildDirectory.dir("generated-resources/main")
99

1010
configurations {
1111
loader {
@@ -68,7 +68,7 @@ task reproducibleLoaderJar(type: Jar) {
6868
reproducibleFileOrder = true
6969
preserveFileTimestamps = false
7070
archiveFileName = "spring-boot-loader.jar"
71-
destinationDirectory = file("${generatedResources}/META-INF/loader")
71+
destinationDirectory = file(generatedResources.map {it.dir("META-INF/loader") })
7272
}
7373

7474
task reproducibleLoaderClassicJar(type: Jar) {
@@ -83,7 +83,7 @@ task reproducibleLoaderClassicJar(type: Jar) {
8383
reproducibleFileOrder = true
8484
preserveFileTimestamps = false
8585
archiveFileName = "spring-boot-loader-classic.jar"
86-
destinationDirectory = file("${generatedResources}/META-INF/loader")
86+
destinationDirectory = file(generatedResources.map { it.dir("META-INF/loader") })
8787
}
8888

8989
task layerToolsJar(type: Sync) {
@@ -92,7 +92,7 @@ task layerToolsJar(type: Sync) {
9292
file(configurations.jarmode.incoming.files.singleFile)
9393
}
9494
rename({ "spring-boot-jarmode-layertools.jar" })
95-
into(file("${generatedResources}/META-INF/jarmode"))
95+
into(file(generatedResources.map { it.dir("META-INF/jarmode") }))
9696
}
9797

9898
sourceSets {

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,19 @@ syncDocumentationSourceForAsciidoctor {
101101

102102
task copySettingsXml(type: Copy) {
103103
from file("src/intTest/projects/settings.xml")
104-
into "${buildDir}/generated-resources/settings"
104+
into layout.buildDirectory.dir("generated-resources/settings")
105105
filter(springRepositoryTransformers.mavenSettings())
106106
}
107107

108108
sourceSets {
109109
main {
110-
output.dir("${buildDir}/generated/resources/xsd", builtBy: "xsdResources")
110+
output.dir(layout.buildDirectory.dir("generated/resources/xsd"), builtBy: "xsdResources")
111111
}
112112
intTest {
113-
output.dir("${buildDir}/generated-resources", builtBy: ["extractVersionProperties", "copySettingsXml"])
113+
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties", "copySettingsXml"])
114114
}
115115
dockerTest {
116-
output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties")
116+
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: "extractVersionProperties")
117117
}
118118
}
119119

@@ -171,7 +171,7 @@ task zip(type: Zip) {
171171

172172
task xsdResources(type: Sync) {
173173
from "src/main/xsd/layers-${project.ext.xsdVersion}.xsd"
174-
into "${buildDir}/generated/resources/xsd/org/springframework/boot/maven"
174+
into layout.buildDirectory.dir("generated/resources/xsd/org/springframework/boot/maven")
175175
rename { fileName -> "layers.xsd" }
176176
}
177177

‎spring-boot-project/spring-boot/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
description = "Spring Boot"
1111

12-
def tomcatConfigProperties = "$buildDir/tomcat-config-properties"
12+
def tomcatConfigProperties = layout.buildDirectory.dir("tomcat-config-properties")
1313

1414
configurations {
1515
tomcatDistribution

‎spring-boot-system-tests/spring-boot-image-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ configurations {
3030

3131
task syncMavenRepository(type: Sync) {
3232
from configurations.app
33-
into "${buildDir}/system-test-maven-repository"
33+
into layout.buildDirectory.dir("system-test-maven-repository")
3434
}
3535

3636
systemTest {

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ dependencies {
2525

2626
task syncMavenRepository(type: Sync) {
2727
from configurations.app
28-
into "${buildDir}/docker-test-maven-repository"
28+
into layout.buildDirectory.dir("docker-test-maven-repository")
2929
}
3030

3131
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
3232
sourceDirectory = file("spring-boot-launch-script-tests-app")
33-
destinationDirectory = file("${buildDir}/spring-boot-launch-script-tests-app")
33+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-launch-script-tests-app"))
3434
}
3535

3636
task buildApp(type: GradleBuild) {
3737
dependsOn syncAppSource, syncMavenRepository
38-
dir = "${buildDir}/spring-boot-launch-script-tests-app"
38+
dir = layout.buildDirectory.dir("spring-boot-launch-script-tests-app")
3939
startParameter.buildCacheEnabled = false
4040
tasks = ["build"]
4141
}
@@ -54,7 +54,7 @@ task syncJdkDownloads(type: Sync) {
5454
dependsOn downloadJdk
5555
from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/bellsoft/"
5656
include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
57-
into "${project.buildDir}/downloads/jdk/bellsoft/"
57+
into layout.buildDirectory.dir("downloads/jdk/bellsoft/")
5858
}
5959

6060
tasks.named("processDockerTestResources").configure {

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ dependencies {
2222

2323
task syncMavenRepository(type: Sync) {
2424
from configurations.app
25-
into "${buildDir}/docker-test-maven-repository"
25+
into layout.buildDirectory.dir("docker-test-maven-repository")
2626
}
2727

2828
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
2929
sourceDirectory = file("spring-boot-loader-classic-tests-app")
30-
destinationDirectory = file("${buildDir}/spring-boot-loader-classic-tests-app")
30+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-classic-tests-app"))
3131
}
3232

3333
task buildApp(type: GradleBuild) {
3434
dependsOn syncAppSource, syncMavenRepository
35-
dir = "${buildDir}/spring-boot-loader-classic-tests-app"
35+
dir = layout.buildDirectory.dir("spring-boot-loader-classic-tests-app")
3636
startParameter.buildCacheEnabled = false
3737
tasks = ["build"]
3838
}

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,29 @@ dependencies {
2828

2929
task syncMavenRepository(type: Sync) {
3030
from configurations.app
31-
into "${buildDir}/docker-test-maven-repository"
31+
into layout.buildDirectory.dir("docker-test-maven-repository")
3232
}
3333

3434
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
3535
sourceDirectory = file("spring-boot-loader-tests-app")
36-
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-app")
36+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-tests-app"))
3737
}
3838

3939
task buildApp(type: GradleBuild) {
4040
dependsOn syncAppSource, syncMavenRepository
41-
dir = "${buildDir}/spring-boot-loader-tests-app"
41+
dir = layout.buildDirectory.dir("spring-boot-loader-tests-app")
4242
startParameter.buildCacheEnabled = false
4343
tasks = ["build"]
4444
}
4545

4646
task syncSignedJarAppSource(type: org.springframework.boot.build.SyncAppSource) {
4747
sourceDirectory = file("spring-boot-loader-tests-signed-jar")
48-
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-signed-jar")
48+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-tests-signed-jar"))
4949
}
5050

5151
task buildSignedJarApp(type: GradleBuild) {
5252
dependsOn syncSignedJarAppSource, syncMavenRepository
53-
dir = "${buildDir}/spring-boot-loader-tests-signed-jar"
53+
dir = layout.buildDirectory.dir("spring-boot-loader-tests-signed-jar")
5454
startParameter.buildCacheEnabled = false
5555
tasks = ["build"]
5656
}
@@ -69,7 +69,7 @@ task syncJdkDownloads(type: Sync) {
6969
dependsOn downloadJdk
7070
from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/oracle/"
7171
include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
72-
into "${project.buildDir}/downloads/jdk/oracle/"
72+
into layout.buildDirectory.dir("downloads/jdk/oracle/")
7373
}
7474

7575
tasks.named("processDockerTestResources").configure {

0 commit comments

Comments
 (0)