Skip to content

Commit bfd2ca7

Browse files
philwebbphilwebb
committed
Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
1 parent 8923763 commit bfd2ca7

File tree

29 files changed

+60
-60
lines changed

29 files changed

+60
-60
lines changed

‎buildSrc/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java-gradle-plugin'
3-
id 'io.spring.javaformat' version "$javaFormatVersion"
3+
id 'io.spring.javaformat' version "${javaFormatVersion}"
44
id 'checkstyle'
55
}
66

@@ -14,15 +14,15 @@ sourceCompatibility = 1.8
1414
targetCompatibility = 1.8
1515

1616
dependencies {
17-
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:$javaFormatVersion"
17+
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
1818
implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.0'
1919
implementation 'commons-codec:commons-codec:1.13'
2020
implementation 'org.apache.maven:maven-embedder:3.6.2'
2121
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:2.4.0'
2222
implementation 'org.springframework:spring-core:5.2.2.RELEASE'
2323
implementation 'org.springframework:spring-web:5.2.2.RELEASE'
2424
implementation 'com.google.code.gson:gson:2.8.5'
25-
implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion"
25+
implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}"
2626
testImplementation 'org.assertj:assertj-core:3.11.1'
2727
testImplementation 'org.apache.logging.log4j:log4j-core:2.12.1'
2828
testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2'

‎buildSrc/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ pluginManagement {
1212
}
1313
}
1414

15-
apply from: "$settingsDir/../gradle/build-cache-settings.gradle"
15+
apply from: "${settingsDir}/../gradle/build-cache-settings.gradle"

‎gradle/build-scan-user-data.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ String customValueSearchUrl(Map<String, String> search) {
7272
"search.names=${encodeURL(name)}&search.values=${encodeURL(value)}"
7373
}.join('&')
7474

75-
"$gradleEnterprise.buildScan.server/scans?$query"
75+
"${gradleEnterprise.buildScan.server}/scans?${query}"
7676
}
7777

7878
String encodeURL(String url) {

‎settings.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
id 'com.gradle.enterprise' version '3.1.1'
2121
}
2222

23-
apply from: "$rootDir/gradle/build-scan-user-data.gradle"
23+
apply from: "${rootDir}/gradle/build-scan-user-data.gradle"
2424
gradleEnterprise {
2525
buildScan {
2626
captureTaskInputFiles = true
@@ -33,7 +33,7 @@ gradleEnterprise {
3333
}
3434
}
3535

36-
apply from: "$settingsDir/gradle/build-cache-settings.gradle"
36+
apply from: "${settingsDir}/gradle/build-cache-settings.gradle"
3737

3838
rootProject.name='spring-boot-build'
3939

@@ -64,10 +64,10 @@ include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-configurati
6464
include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests'
6565
include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-server-tests'
6666

67-
file("$rootDir/spring-boot-project/spring-boot-starters").eachDirMatch(~/spring-boot-starter.*/) {
68-
include "spring-boot-project:spring-boot-starters:$it.name"
67+
file("${rootDir}/spring-boot-project/spring-boot-starters").eachDirMatch(~/spring-boot-starter.*/) {
68+
include "spring-boot-project:spring-boot-starters:${it.name}"
6969
}
7070

71-
file("$rootDir/spring-boot-tests/spring-boot-smoke-tests").eachDirMatch(~/spring-boot-smoke-test.*/) {
72-
include "spring-boot-tests:spring-boot-smoke-tests:$it.name"
71+
file("${rootDir}/spring-boot-tests/spring-boot-smoke-tests").eachDirMatch(~/spring-boot-smoke-test.*/) {
72+
include "spring-boot-tests:spring-boot-smoke-tests:${it.name}"
7373
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ compileTestJava {
152152
}
153153

154154
test {
155-
outputs.dir("$buildDir/generated-snippets")
155+
outputs.dir("${buildDir}/generated-snippets")
156156
}
157157

158158
asciidoctor {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dependencies {
8181
}
8282

8383
task syncSpringBootDependenciesBom(type: Sync) {
84-
destinationDir = file("$buildDir/generated-resources/org/springframework/boot/cli/compiler/dependencies")
84+
destinationDir = file("${buildDir}/generated-resources/org/springframework/boot/cli/compiler/dependencies")
8585
from configurations.dependenciesBom
8686
}
8787

@@ -92,7 +92,7 @@ task syncTestRepository(type: Sync) {
9292

9393
sourceSets {
9494
main {
95-
output.dir("$buildDir/generated-resources", builtBy: 'syncSpringBootDependenciesBom')
95+
output.dir("${buildDir}/generated-resources", builtBy: 'syncSpringBootDependenciesBom')
9696
}
9797
}
9898

@@ -156,25 +156,25 @@ task tar(type: Tar) {
156156

157157
task scoopManifest(type: org.springframework.boot.build.cli.ScoopManifest) {
158158
dependsOn zip
159-
outputDir = file("$buildDir/scoop")
159+
outputDir = file("${buildDir}/scoop")
160160
template = file('src/main/scoop/springboot.json')
161161
archive = zip.archiveFile
162162
}
163163

164-
def scoopManifestArtifact = artifacts.add('archives', file("$buildDir/scoop/springboot.json")) {
164+
def scoopManifestArtifact = artifacts.add('archives', file("${buildDir}/scoop/springboot.json")) {
165165
type 'json'
166166
classifier 'scoop'
167167
builtBy 'scoopManifest'
168168
}
169169

170170
task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
171171
dependsOn tar
172-
outputDir = file("$buildDir/homebrew")
172+
outputDir = file("${buildDir}/homebrew")
173173
template = file('src/main/homebrew/springboot.rb')
174174
archive = tar.archiveFile
175175
}
176176

177-
def homebrewFormulaArtifact = artifacts.add('archives', file("$buildDir/homebrew/springboot.rb")) {
177+
def homebrewFormulaArtifact = artifacts.add('archives', file("${buildDir}/homebrew/springboot.rb")) {
178178
type 'rb'
179179
classifier 'homebrew'
180180
builtBy 'homebrewFormula'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ bom {
970970
]
971971
}
972972
}
973-
library('Kotlin', "$kotlinVersion") {
973+
library('Kotlin', "${kotlinVersion}") {
974974
group('org.jetbrains.kotlin') {
975975
imports = [
976976
'kotlin-bom'
@@ -1411,7 +1411,7 @@ bom {
14111411
]
14121412
}
14131413
}
1414-
library('Spring Boot', "$version") {
1414+
library('Spring Boot', "${version}") {
14151415
group('org.springframework.boot') {
14161416
modules = [
14171417
'spring-boot',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dependencies {
7575
}
7676

7777
task copyIntTestDependencies(type: Copy) {
78-
destinationDir = file("$buildDir/dependencies")
78+
destinationDir = file("${buildDir}/dependencies")
7979
from {
8080
configurations.intTestDependencies
8181
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ task javadoc(type: Javadoc) {
4343
dependsOn publishedProjects.javadoc
4444
source publishedProjects.javadoc.source
4545
classpath = project.files(publishedProjects.javadoc.classpath)
46-
destinationDir = project.file "$buildDir/docs/javadoc"
46+
destinationDir = project.file "${buildDir}/docs/javadoc"
4747
options {
4848
author = true
4949
docTitle = "Spring Boot ${project.version} API"
@@ -75,27 +75,27 @@ task javadoc(type: Javadoc) {
7575

7676
task documentTestSlices(type: org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) {
7777
testSlices = configurations.testSlices
78-
outputFile = file("$buildDir/docs/generated/test-slice-auto-configuration.adoc")
78+
outputFile = file("${buildDir}/docs/generated/test-slice-auto-configuration.adoc")
7979
}
8080

8181
task documentStarters(type: org.springframework.boot.build.starters.DocumentStarters) {
82-
outputDir = file("$buildDir/docs/generated/starters/")
82+
outputDir = file("${buildDir}/docs/generated/starters/")
8383
}
8484

8585
task documentAutoConfigurationClasses(type: org.springframework.boot.build.autoconfigure.DocumentAutoConfigurationClasses) {
8686
autoConfiguration = configurations.autoConfiguration
87-
outputDir = file("$buildDir/docs/generated/auto-configuration-classes/")
87+
outputDir = file("${buildDir}/docs/generated/auto-configuration-classes/")
8888
}
8989

9090
task documentDependencyVersions(type: org.springframework.boot.build.constraints.DocumentConstrainedVersions) {
9191
dependsOn dependencyVersions
9292
constrainedVersions.set(providers.provider { dependencyVersions.constrainedVersions })
93-
outputFile = file("$buildDir/docs/generated/dependency-versions.adoc")
93+
outputFile = file("${buildDir}/docs/generated/dependency-versions.adoc")
9494
}
9595

9696
task documentConfigurationProperties(type: org.springframework.boot.build.context.properties.DocumentConfigurationProperties) {
9797
configurationPropertyMetadata = configurations.configurationProperties
98-
outputDir = file("$buildDir/docs/generated/config-docs/")
98+
outputDir = file("${buildDir}/docs/generated/config-docs/")
9999
}
100100

101101
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
@@ -148,7 +148,7 @@ syncDocumentationSourceForAsciidoctor {
148148
dependsOn documentAutoConfigurationClasses
149149
dependsOn documentDependencyVersions
150150
dependsOn documentConfigurationProperties
151-
from("$buildDir/docs/generated") {
151+
from("${buildDir}/docs/generated") {
152152
into 'asciidoc'
153153
}
154154
from ("src/main/java") {
@@ -165,7 +165,7 @@ syncDocumentationSourceForAsciidoctorMultipage {
165165
dependsOn documentAutoConfigurationClasses
166166
dependsOn documentDependencyVersions
167167
dependsOn documentConfigurationProperties
168-
from("$buildDir/docs/generated") {
168+
from("${buildDir}/docs/generated") {
169169
into 'asciidoc'
170170
}
171171
from ("src/main/java") {
@@ -182,7 +182,7 @@ syncDocumentationSourceForAsciidoctorPdf {
182182
dependsOn documentAutoConfigurationClasses
183183
dependsOn documentDependencyVersions
184184
dependsOn documentConfigurationProperties
185-
from("$buildDir/docs/generated") {
185+
from("${buildDir}/docs/generated") {
186186
into 'asciidoc'
187187
}
188188
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
@@ -93,5 +93,5 @@ test {
9393

9494
task testSliceMetadata(type: org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) {
9595
sourceSet = sourceSets.main
96-
outputFile = file("$buildDir/test-slice-metadata.properties")
96+
outputFile = file("${buildDir}/test-slice-metadata.properties")
9797
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
description = 'Spring Boot Antlib'
99

1010
ext {
11-
antVersion = "1.9.3"
11+
antVersion = '1.9.3'
1212
}
1313

1414
configurations {
@@ -17,12 +17,12 @@ configurations {
1717
}
1818

1919
dependencies {
20-
antUnit "org.apache.ant:ant-antunit:1.3"
21-
antIvy "org.apache.ivy:ivy:2.4.0"
20+
antUnit 'org.apache.ant:ant-antunit:1.3'
21+
antIvy 'org.apache.ivy:ivy:2.4.0'
2222

23-
api platform(project(":spring-boot-project:spring-boot-dependencies"))
23+
api platform(project(':spring-boot-project:spring-boot-dependencies'))
2424

25-
compileOnly project(":spring-boot-project:spring-boot-tools:spring-boot-loader")
25+
compileOnly project(':spring-boot-project:spring-boot-tools:spring-boot-loader')
2626
compileOnly "org.apache.ant:ant:${antVersion}"
2727

2828
implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ if (project.hasProperty('applyApplicationPlugin')) {
99

1010
task('taskExists') {
1111
doFirst {
12-
println "$taskName exists = ${tasks.findByName(taskName) != null}"
12+
println "${taskName} exists = ${tasks.findByName(taskName) != null}"
1313
}
1414
}
1515

1616
task('distributionExists') {
1717
doFirst {
1818
boolean found = project.hasProperty('distributions') &&
1919
distributions.findByName(distributionName) != null
20-
println "$distributionName exists = $found"
20+
println "${distributionName} exists = ${found}"
2121
}
2222
}
2323

2424
task('javaCompileEncoding') {
2525
doFirst {
2626
tasks.withType(JavaCompile) {
27-
println "$name = ${options.encoding}"
27+
println "${name} = ${options.encoding}"
2828
}
2929
}
3030
}
3131

3232
task('startScriptsDefaultJvmOpts') {
3333
doFirst {
3434
tasks.withType(org.springframework.boot.gradle.tasks.application.CreateBootStartScripts) {
35-
println "$name defaultJvmOpts = $defaultJvmOpts"
35+
println "${name} defaultJvmOpts = ${defaultJvmOpts}"
3636
}
3737
}
3838
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ dependencies {
1414

1515
compileJava {
1616
doLast {
17-
println "$name compiler args: ${options.compilerArgs}"
17+
println "${name} compiler args: ${options.compilerArgs}"
1818
}
1919
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ plugins {
55

66
compileJava {
77
doLast {
8-
println "$name compiler args: ${options.compilerArgs}"
8+
println "${name} compiler args: ${options.compilerArgs}"
99
}
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tasks.withType(JavaCompile) {
1111
task('javaCompileTasksCompilerArgs') {
1212
doFirst {
1313
tasks.withType(JavaCompile) {
14-
println "$name compiler args: ${options.compilerArgs}"
14+
println "${name} compiler args: ${options.compilerArgs}"
1515
}
1616
}
1717
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ tasks.withType(JavaCompile) {
1010
task('javaCompileTasksCompilerArgs') {
1111
doFirst {
1212
tasks.withType(JavaCompile) {
13-
println "$name compiler args: ${options.compilerArgs}"
13+
println "${name} compiler args: ${options.compilerArgs}"
1414
}
1515
}
1616
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
task('javaCompileTasksCompilerArgs') {
77
doFirst {
88
tasks.withType(JavaCompile) {
9-
println "$name compiler args: ${options.compilerArgs}"
9+
println "${name} compiler args: ${options.compilerArgs}"
1010
}
1111
}
1212
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ if (project.hasProperty('applyJavaPlugin')) {
88

99
task('taskExists') {
1010
doFirst {
11-
println "$taskName exists = ${tasks.findByName(taskName) != null}"
11+
println "${taskName} exists = ${tasks.findByName(taskName) != null}"
1212
}
1313
}
1414

1515
task('javaCompileEncoding') {
1616
doFirst {
1717
tasks.withType(JavaCompile) {
18-
println "$name = ${options.encoding}"
18+
println "${name} = ${options.encoding}"
1919
}
2020
}
2121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tasks.withType(KotlinCompile) {
1313
task('kotlinCompileTasksJavaParameters') {
1414
doFirst {
1515
tasks.withType(KotlinCompile) {
16-
println "$name java parameters: ${kotlinOptions.javaParameters}"
16+
println "${name} java parameters: ${kotlinOptions.javaParameters}"
1717
}
1818
}
1919
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
99
task('kotlinCompileTasksJavaParameters') {
1010
doFirst {
1111
tasks.withType(KotlinCompile) {
12-
println "$name java parameters: ${kotlinOptions.javaParameters}"
12+
println "${name} java parameters: ${kotlinOptions.javaParameters}"
1313
}
1414
}
1515
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/WarPluginActionIntegrationTests.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ if (project.hasProperty('applyWarPlugin')) {
88

99
task('taskExists') {
1010
doFirst {
11-
println "$taskName exists = ${tasks.findByName(taskName) != null}"
11+
println "${taskName} exists = ${tasks.findByName(taskName) != null}"
1212
}
1313
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ version = '1.0'
1414
uploadBootArchives {
1515
repositories {
1616
mavenDeployer {
17-
repository(url: "file:$buildDir/repo")
17+
repository(url: "file:${buildDir}/repo")
1818
}
1919
}
2020
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ version = '1.0'
1414
uploadBootArchives {
1515
repositories {
1616
mavenDeployer {
17-
repository(url: "file:$buildDir/repo")
17+
repository(url: "file:${buildDir}/repo")
1818
}
1919
}
2020
}

0 commit comments

Comments
 (0)