Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Gradle expression references

Browse Source 
Expand all expression `$` references to the full `${...}` form.
This commit is contained in:
Phillip Webb
2020-01-21 18:33:33 -08:00
parent 89237634c7
commit bfd2ca7fd9
29 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@@ -152,7 +152,7 @@ compileTestJava {
}
test {
outputs.dir("$buildDir/generated-snippets")
outputs.dir("${buildDir}/generated-snippets")
}
asciidoctor {

12
spring-boot-project/spring-boot-cli/build.gradle
View File

@@ -81,7 +81,7 @@ dependencies {
}
task syncSpringBootDependenciesBom(type: Sync) {
destinationDir = file("$buildDir/generated-resources/org/springframework/boot/cli/compiler/dependencies")
destinationDir = file("${buildDir}/generated-resources/org/springframework/boot/cli/compiler/dependencies")
from configurations.dependenciesBom
}
@@ -92,7 +92,7 @@ task syncTestRepository(type: Sync) {
sourceSets {
main {
output.dir("$buildDir/generated-resources", builtBy: 'syncSpringBootDependenciesBom')
output.dir("${buildDir}/generated-resources", builtBy: 'syncSpringBootDependenciesBom')
}
}
@@ -156,12 +156,12 @@ task tar(type: Tar) {
task scoopManifest(type: org.springframework.boot.build.cli.ScoopManifest) {
dependsOn zip
outputDir = file("$buildDir/scoop")
outputDir = file("${buildDir}/scoop")
template = file('src/main/scoop/springboot.json')
archive = zip.archiveFile
}
def scoopManifestArtifact = artifacts.add('archives', file("$buildDir/scoop/springboot.json")) {
def scoopManifestArtifact = artifacts.add('archives', file("${buildDir}/scoop/springboot.json")) {
type 'json'
classifier 'scoop'
builtBy 'scoopManifest'
@@ -169,12 +169,12 @@ def scoopManifestArtifact = artifacts.add('archives', file("$buildDir/scoop/spri
task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
dependsOn tar
outputDir = file("$buildDir/homebrew")
outputDir = file("${buildDir}/homebrew")
template = file('src/main/homebrew/springboot.rb')
archive = tar.archiveFile
}
def homebrewFormulaArtifact = artifacts.add('archives', file("$buildDir/homebrew/springboot.rb")) {
def homebrewFormulaArtifact = artifacts.add('archives', file("${buildDir}/homebrew/springboot.rb")) {
type 'rb'
classifier 'homebrew'
builtBy 'homebrewFormula'

4
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -970,7 +970,7 @@ bom {
]
}
}
library('Kotlin', "$kotlinVersion") {
library('Kotlin', "${kotlinVersion}") {
group('org.jetbrains.kotlin') {
imports = [
'kotlin-bom'
@@ -1411,7 +1411,7 @@ bom {
]
}
}
library('Spring Boot', "$version") {
library('Spring Boot', "${version}") {
group('org.springframework.boot') {
modules = [
'spring-boot',

2
spring-boot-project/spring-boot-devtools/build.gradle
View File

@@ -75,7 +75,7 @@ dependencies {
}
task copyIntTestDependencies(type: Copy) {
destinationDir = file("$buildDir/dependencies")
destinationDir = file("${buildDir}/dependencies")
from {
configurations.intTestDependencies
}

18
spring-boot-project/spring-boot-docs/build.gradle
View File

@@ -43,7 +43,7 @@ task javadoc(type: Javadoc) {
dependsOn publishedProjects.javadoc
source publishedProjects.javadoc.source
classpath = project.files(publishedProjects.javadoc.classpath)
destinationDir = project.file "$buildDir/docs/javadoc"
destinationDir = project.file "${buildDir}/docs/javadoc"
options {
author = true
docTitle = "Spring Boot ${project.version} API"
@@ -75,27 +75,27 @@ task javadoc(type: Javadoc) {
task documentTestSlices(type: org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) {
testSlices = configurations.testSlices
outputFile = file("$buildDir/docs/generated/test-slice-auto-configuration.adoc")
outputFile = file("${buildDir}/docs/generated/test-slice-auto-configuration.adoc")
}
task documentStarters(type: org.springframework.boot.build.starters.DocumentStarters) {
outputDir = file("$buildDir/docs/generated/starters/")
outputDir = file("${buildDir}/docs/generated/starters/")
}
task documentAutoConfigurationClasses(type: org.springframework.boot.build.autoconfigure.DocumentAutoConfigurationClasses) {
autoConfiguration = configurations.autoConfiguration
outputDir = file("$buildDir/docs/generated/auto-configuration-classes/")
outputDir = file("${buildDir}/docs/generated/auto-configuration-classes/")
}
task documentDependencyVersions(type: org.springframework.boot.build.constraints.DocumentConstrainedVersions) {
dependsOn dependencyVersions
constrainedVersions.set(providers.provider { dependencyVersions.constrainedVersions })
outputFile = file("$buildDir/docs/generated/dependency-versions.adoc")
outputFile = file("${buildDir}/docs/generated/dependency-versions.adoc")
}
task documentConfigurationProperties(type: org.springframework.boot.build.context.properties.DocumentConfigurationProperties) {
configurationPropertyMetadata = configurations.configurationProperties
outputDir = file("$buildDir/docs/generated/config-docs/")
outputDir = file("${buildDir}/docs/generated/config-docs/")
}
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
@@ -148,7 +148,7 @@ syncDocumentationSourceForAsciidoctor {
dependsOn documentAutoConfigurationClasses
dependsOn documentDependencyVersions
dependsOn documentConfigurationProperties
from("$buildDir/docs/generated") {
from("${buildDir}/docs/generated") {
into 'asciidoc'
}
from ("src/main/java") {
@@ -165,7 +165,7 @@ syncDocumentationSourceForAsciidoctorMultipage {
dependsOn documentAutoConfigurationClasses
dependsOn documentDependencyVersions
dependsOn documentConfigurationProperties
from("$buildDir/docs/generated") {
from("${buildDir}/docs/generated") {
into 'asciidoc'
}
from ("src/main/java") {
@@ -182,7 +182,7 @@ syncDocumentationSourceForAsciidoctorPdf {
dependsOn documentAutoConfigurationClasses
dependsOn documentDependencyVersions
dependsOn documentConfigurationProperties
from("$buildDir/docs/generated") {
from("${buildDir}/docs/generated") {
into 'asciidoc'
}
from ("src/main/java") {

2
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@@ -93,5 +93,5 @@ test {
task testSliceMetadata(type: org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) {
sourceSet = sourceSets.main
outputFile = file("$buildDir/test-slice-metadata.properties")
outputFile = file("${buildDir}/test-slice-metadata.properties")
}

10
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@@ -8,7 +8,7 @@ plugins {
description = 'Spring Boot Antlib'
ext {
antVersion = "1.9.3"
antVersion = '1.9.3'
}
configurations {
@@ -17,12 +17,12 @@ configurations {
}
dependencies {
antUnit "org.apache.ant:ant-antunit:1.3"
antIvy "org.apache.ivy:ivy:2.4.0"
antUnit 'org.apache.ant:ant-antunit:1.3'
antIvy 'org.apache.ivy:ivy:2.4.0'
api platform(project(":spring-boot-project:spring-boot-dependencies"))
api platform(project(':spring-boot-project:spring-boot-dependencies'))
compileOnly project(":spring-boot-project:spring-boot-tools:spring-boot-loader")
compileOnly project(':spring-boot-project:spring-boot-tools:spring-boot-loader')
compileOnly "org.apache.ant:ant:${antVersion}"
implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")

8
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.gradle
View File

@@ -9,7 +9,7 @@ if (project.hasProperty('applyApplicationPlugin')) {
task('taskExists') {
doFirst {
println "$taskName exists = ${tasks.findByName(taskName) != null}"
println "${taskName} exists = ${tasks.findByName(taskName) != null}"
}
}
@@ -17,14 +17,14 @@ task('distributionExists') {
doFirst {
boolean found = project.hasProperty('distributions') &&
distributions.findByName(distributionName) != null
println "$distributionName exists = $found"
println "${distributionName} exists = ${found}"
}
}
task('javaCompileEncoding') {
doFirst {
tasks.withType(JavaCompile) {
println "$name = ${options.encoding}"
println "${name} = ${options.encoding}"
}
}
}
@@ -32,7 +32,7 @@ task('javaCompileEncoding') {
task('startScriptsDefaultJvmOpts') {
doFirst {
tasks.withType(org.springframework.boot.gradle.tasks.application.CreateBootStartScripts) {
println "$name defaultJvmOpts = $defaultJvmOpts"
println "${name} defaultJvmOpts = ${defaultJvmOpts}"
}
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle
View File

@@ -14,6 +14,6 @@ dependencies {
compileJava {
doLast {
println "$name compiler args: ${options.compilerArgs}"
println "${name} compiler args: ${options.compilerArgs}"
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsNotConfiguredWhenProcessorIsAbsent.gradle
View File

@@ -5,6 +5,6 @@ plugins {
compileJava {
doLast {
println "$name compiler args: ${options.compilerArgs}"
println "${name} compiler args: ${options.compilerArgs}"
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-javaCompileTasksCanOverrideDefaultParametersCompilerFlag.gradle
View File

@@ -11,7 +11,7 @@ tasks.withType(JavaCompile) {
task('javaCompileTasksCompilerArgs') {
doFirst {
tasks.withType(JavaCompile) {
println "$name compiler args: ${options.compilerArgs}"
println "${name} compiler args: ${options.compilerArgs}"
}
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-javaCompileTasksUseParametersAndAdditionalCompilerFlags.gradle
View File

@@ -10,7 +10,7 @@ tasks.withType(JavaCompile) {
task('javaCompileTasksCompilerArgs') {
doFirst {
tasks.withType(JavaCompile) {
println "$name compiler args: ${options.compilerArgs}"
println "${name} compiler args: ${options.compilerArgs}"
}
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-javaCompileTasksUseParametersCompilerFlagByDefault.gradle
View File

@@ -6,7 +6,7 @@ plugins {
task('javaCompileTasksCompilerArgs') {
doFirst {
tasks.withType(JavaCompile) {
println "$name compiler args: ${options.compilerArgs}"
println "${name} compiler args: ${options.compilerArgs}"
}
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.gradle
View File

@@ -8,14 +8,14 @@ if (project.hasProperty('applyJavaPlugin')) {
task('taskExists') {
doFirst {
println "$taskName exists = ${tasks.findByName(taskName) != null}"
println "${taskName} exists = ${tasks.findByName(taskName) != null}"
}
}
task('javaCompileEncoding') {
doFirst {
tasks.withType(JavaCompile) {
println "$name = ${options.encoding}"
println "${name} = ${options.encoding}"
}
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinCompileTasksCanOverrideDefaultJavaParametersFlag.gradle
View File

@@ -13,7 +13,7 @@ tasks.withType(KotlinCompile) {
task('kotlinCompileTasksJavaParameters') {
doFirst {
tasks.withType(KotlinCompile) {
println "$name java parameters: ${kotlinOptions.javaParameters}"
println "${name} java parameters: ${kotlinOptions.javaParameters}"
}
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinCompileTasksUseJavaParametersFlagByDefault.gradle
View File

@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
task('kotlinCompileTasksJavaParameters') {
doFirst {
tasks.withType(KotlinCompile) {
println "$name java parameters: ${kotlinOptions.javaParameters}"
println "${name} java parameters: ${kotlinOptions.javaParameters}"
}
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/WarPluginActionIntegrationTests.gradle
View File

@@ -8,6 +8,6 @@ if (project.hasProperty('applyWarPlugin')) {
task('taskExists') {
doFirst {
println "$taskName exists = ${tasks.findByName(taskName) != null}"
println "${taskName} exists = ${tasks.findByName(taskName) != null}"
}
}

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

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

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

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

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

@@ -14,7 +14,7 @@ version = '1.0'
publishing {
repositories {
maven {
url "$buildDir/repo"
url "${buildDir}/repo"
}
}
publications {

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

@@ -14,7 +14,7 @@ version = '1.0'
publishing {
repositories {
maven {
url "$buildDir/repo"
url "${buildDir}/repo"
}
}
publications {