Browse Source

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

See gh-37167
pull/37210/head
Andy Wilkinson 3 years ago
parent
commit
a77863245d
  1. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
  2. 5
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfo.java
  3. 1
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-basicExecution.gradle
  4. 1
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-removePropertiesUsingEmptyStrings.gradle
  5. 1
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-removePropertiesUsingNulls.gradle
  6. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-explodedApplicationClasspath.gradle
  7. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests-bootJarCanBeUploaded.gradle
  8. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests-bootWarCanBeUploaded.gradle
  9. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests-bootJarCanBePublished.gradle
  10. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests-bootWarCanBePublished.gradle

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@ -48,7 +48,7 @@ gradlePlugin {
} }
task preparePluginValidationClasses(type: Copy) { task preparePluginValidationClasses(type: Copy) {
destinationDir = file("$buildDir/classes/java/pluginValidation") destinationDir = layout.buildDirectory.dir("classes/java/pluginValidation").get().asFile
from(sourceSets.main.output.classesDirs) { from(sourceSets.main.output.classesDirs) {
exclude "**/CreateBootStartScripts.class" exclude "**/CreateBootStartScripts.class"
} }

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfo.java

@ -22,9 +22,9 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.gradle.api.Action; import org.gradle.api.Action;
import org.gradle.api.Project;
import org.gradle.api.Task; import org.gradle.api.Task;
import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.DirectoryProperty;
import org.gradle.api.file.ProjectLayout;
import org.gradle.api.internal.ConventionTask; import org.gradle.api.internal.ConventionTask;
import org.gradle.api.tasks.Nested; import org.gradle.api.tasks.Nested;
import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.OutputDirectory;
@ -75,7 +75,8 @@ public class BuildInfo extends ConventionTask {
/** /**
* Returns the directory to which the {@code build-info.properties} file will be * Returns the directory to which the {@code build-info.properties} file will be
* written. Defaults to the {@link Project#getBuildDir() Project's build directory}. * written. Defaults to the {@link ProjectLayout#getBuildDirectory() Project's build
* directory}.
* @return the destination directory * @return the destination directory
*/ */
@OutputDirectory @OutputDirectory

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-basicExecution.gradle

@ -5,7 +5,6 @@ plugins {
version = '0.1.0' version = '0.1.0'
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) { task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
destinationDir project.buildDir
properties { properties {
artifact = 'foo' artifact = 'foo'
group = 'foo' group = 'foo'

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-removePropertiesUsingEmptyStrings.gradle

@ -6,7 +6,6 @@ group = 'foo'
version = '0.1.0' version = '0.1.0'
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) { task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
destinationDir project.buildDir
properties { properties {
group = '' group = ''
artifact = '' artifact = ''

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-removePropertiesUsingNulls.gradle

@ -6,7 +6,6 @@ group = 'foo'
version = '0.1.0' version = '0.1.0'
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) { task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
destinationDir project.buildDir
properties { properties {
group = null group = null
artifact = null artifact = null

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-explodedApplicationClasspath.gradle

@ -15,7 +15,7 @@ dependencies {
task explode(type: Sync) { task explode(type: Sync) {
dependsOn(bootJar) dependsOn(bootJar)
destinationDir = file("$buildDir/exploded") destinationDir = layout.buildDirectory.dir("exploded").get().asFile
from zipTree(files(bootJar).singleFile) from zipTree(files(bootJar).singleFile)
} }

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests-bootJarCanBeUploaded.gradle

@ -14,7 +14,7 @@ version = '1.0'
uploadBootArchives { uploadBootArchives {
repositories { repositories {
mavenDeployer { mavenDeployer {
repository(url: "file:${buildDir}/repo") repository(url: "file:${layout.buildDirectory.dir("repo").get().asFile}")
} }
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests-bootWarCanBeUploaded.gradle

@ -14,7 +14,7 @@ version = '1.0'
uploadBootArchives { uploadBootArchives {
repositories { repositories {
mavenDeployer { mavenDeployer {
repository(url: "file:${buildDir}/repo") repository(url: "file:${layout.buildDirectory.dir("repo").get().asFile}")
} }
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests-bootJarCanBePublished.gradle

@ -14,7 +14,7 @@ version = '1.0'
publishing { publishing {
repositories { repositories {
maven { maven {
url "${buildDir}/repo" url = layout.buildDirectory.dir("repo")
} }
} }
publications { publications {

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests-bootWarCanBePublished.gradle

@ -14,7 +14,7 @@ version = '1.0'
publishing { publishing {
repositories { repositories {
maven { maven {
url "${buildDir}/repo" url = layout.buildDirectory.dir("repo")
} }
} }
publications { publications {

Loading…
Cancel
Save