Skip to content

Commit 8118b81

Browse files
philwebbphilwebb
committed
Merge pull request #45009 from izeye
* pr/45009: Replace deprecated Project.task() Closes gh-45009
2 parents ce64f36 + 08c67cc commit 8118b81

File tree

41 files changed

+92
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+92
-92
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ dependencies {
8383
testRuntimeOnly("io.r2dbc:r2dbc-h2")
8484
}
8585

86-
task syncIntTestDependencies(type: Sync) {
86+
tasks.register("syncIntTestDependencies", Sync) {
8787
destinationDir = file(layout.buildDirectory.dir("dependencies"))
8888
from {
8989
configurations.intTestDependencies

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -227,38 +227,38 @@ task aggregatedJavadoc(type: Javadoc) {
227227
}
228228
}
229229

230-
task documentTestSlices(type: org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) {
230+
tasks.register("documentTestSlices", org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) {
231231
testSlices = configurations.testSlices
232232
outputFile = layout.buildDirectory.file("generated/docs/test-auto-configuration/documented-slices.adoc")
233233
}
234234

235-
task documentStarters(type: org.springframework.boot.build.starters.DocumentStarters) {
235+
tasks.register("documentStarters", org.springframework.boot.build.starters.DocumentStarters) {
236236
outputDir = layout.buildDirectory.dir("generated/docs/using/starters/")
237237
}
238238

239-
task documentAutoConfigurationClasses(type: org.springframework.boot.build.autoconfigure.DocumentAutoConfigurationClasses) {
239+
tasks.register("documentAutoConfigurationClasses", org.springframework.boot.build.autoconfigure.DocumentAutoConfigurationClasses) {
240240
autoConfiguration = configurations.autoConfiguration
241241
outputDir = layout.buildDirectory.dir("generated/docs/auto-configuration-classes/documented-auto-configuration-classes/")
242242
}
243243

244-
task documentDependencyVersionCoordinates(type: org.springframework.boot.build.docs.DocumentManagedDependencies) {
244+
tasks.register("documentDependencyVersionCoordinates", org.springframework.boot.build.docs.DocumentManagedDependencies) {
245245
outputFile = layout.buildDirectory.file("generated/docs/dependency-versions/documented-coordinates.adoc")
246246
resolvedBoms = configurations.resolvedBom
247247
}
248248

249-
task documentDependencyVersionProperties(type: org.springframework.boot.build.docs.DocumentVersionProperties) {
249+
tasks.register("documentDependencyVersionProperties", org.springframework.boot.build.docs.DocumentVersionProperties) {
250250
outputFile = layout.buildDirectory.file("generated/docs/dependency-versions/documented-properties.adoc")
251251
resolvedBoms = configurations.resolvedBom
252252
}
253253

254-
task documentConfigurationProperties(type: org.springframework.boot.build.context.properties.DocumentConfigurationProperties) {
254+
tasks.register("documentConfigurationProperties", org.springframework.boot.build.context.properties.DocumentConfigurationProperties) {
255255
configurationPropertyMetadata = configurations.configurationProperties
256256
outputDir = layout.buildDirectory.dir("generated/docs/application-properties")
257257
}
258258

259-
task documentDevtoolsPropertyDefaults(type: org.springframework.boot.build.devtools.DocumentDevtoolsPropertyDefaults) {}
259+
tasks.register("documentDevtoolsPropertyDefaults", org.springframework.boot.build.devtools.DocumentDevtoolsPropertyDefaults) {}
260260

261-
task runRemoteSpringApplicationExample(type: org.springframework.boot.build.docs.ApplicationRunner) {
261+
tasks.register("runRemoteSpringApplicationExample", org.springframework.boot.build.docs.ApplicationRunner) {
262262
classpath = configurations.remoteSpringApplicationExample
263263
mainClass = "org.springframework.boot.devtools.RemoteSpringApplication"
264264
args = ["https://myapp.example.com", "--spring.devtools.remote.secret=secret", "--spring.devtools.livereload.port=0"]
@@ -268,7 +268,7 @@ task runRemoteSpringApplicationExample(type: org.springframework.boot.build.docs
268268
normalizeLiveReloadPort()
269269
}
270270

271-
task runSpringApplicationExample(type: org.springframework.boot.build.docs.ApplicationRunner) {
271+
tasks.register("runSpringApplicationExample", org.springframework.boot.build.docs.ApplicationRunner) {
272272
classpath = configurations.springApplicationExample + sourceSets.main.output
273273
mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
274274
args = ["--server.port=0"]
@@ -277,7 +277,7 @@ task runSpringApplicationExample(type: org.springframework.boot.build.docs.Appli
277277
normalizeTomcatPort()
278278
}
279279

280-
task runLoggingFormatExample(type: org.springframework.boot.build.docs.ApplicationRunner) {
280+
tasks.register("runLoggingFormatExample", org.springframework.boot.build.docs.ApplicationRunner) {
281281
classpath = configurations.springApplicationExample + sourceSets.main.output
282282
mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
283283
args = ["--spring.main.banner-mode=off", "--server.port=0", "--spring.application.name=myapp"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ test {
129129
include "**/*Tests.class"
130130
}
131131

132-
task testSliceMetadata(type: org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) {
132+
tasks.register("testSliceMetadata", org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) {
133133
sourceSet = sourceSets.main
134134
outputFile = layout.buildDirectory.file("test-slice-metadata.properties")
135135
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
implementation("org.springframework:spring-core")
2626
}
2727

28-
task syncIntegrationTestSources(type: Sync) {
28+
tasks.register("syncIntegrationTestSources", Sync) {
2929
destinationDir = file(layout.buildDirectory.dir("it"))
3030
from file("src/it")
3131
filter(springRepositoryTransformers.ant())
@@ -39,7 +39,7 @@ processResources {
3939
inputs.property "version", version
4040
}
4141

42-
task integrationTest {
42+
tasks.register("integrationTest") {
4343
dependsOn syncIntegrationTestSources, jar
4444
def resultsDir = file(layout.buildDirectory.dir("test-results/integrationTest"))
4545
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
testImplementation("org.springframework:spring-test")
4747
}
4848

49-
task fullJar(type: Jar) {
49+
tasks.register("fullJar", Jar) {
5050
dependsOn configurations.loader
5151
archiveClassifier = "full"
5252
entryCompression = "stored"
@@ -89,7 +89,7 @@ def configureArchive(archive) {
8989
}
9090
}
9191

92-
task zip(type: Zip) {
92+
tasks.register("zip", Zip) {
9393
archiveClassifier = "bin"
9494
configureArchive it
9595
}
@@ -98,14 +98,14 @@ intTest {
9898
dependsOn zip
9999
}
100100

101-
task tar(type: Tar) {
101+
tasks.register("tar", Tar) {
102102
compression = "gzip"
103103
archiveExtension = "tar.gz"
104104
configureArchive it
105105
}
106106

107107
if (BuildProperties.get(project).buildType() == BuildType.OPEN_SOURCE) {
108-
task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
108+
tasks.register("homebrewFormula", org.springframework.boot.build.cli.HomebrewFormula) {
109109
dependsOn tar
110110
outputDir = layout.buildDirectory.dir("homebrew")
111111
template = file("src/main/homebrew/spring-boot.rb")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ gradlePlugin {
134134
}
135135
}
136136

137-
task preparePluginValidationClasses(type: Copy) {
137+
tasks.register("preparePluginValidationClasses", Copy) {
138138
destinationDir = layout.buildDirectory.dir("classes/java/pluginValidation").get().asFile
139139
from(sourceSets.main.output.classesDirs) {
140140
exclude "**/CreateBootStartScripts.class"

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/typical-plugins.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
apply plugin: 'io.spring.dependency-management'
88
// end::apply[]
99

10-
task verify {
10+
tasks.register("verify") {
1111
doLast {
1212
plugins.getPlugin(org.gradle.api.plugins.JavaPlugin.class)
1313
plugins.getPlugin(io.spring.gradle.dependencymanagement.DependencyManagementPlugin.class)

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/custom-version.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repositories {
2424
}
2525
}
2626

27-
task slf4jVersion {
27+
tasks.register("slf4jVersion") {
2828
doLast {
2929
println dependencyManagement.managedVersions['org.slf4j:slf4j-api']
3030
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repositories {
2222
}
2323
}
2424

25-
task doesNotHaveDependencyManagement {
25+
tasks.register("doesNotHaveDependencyManagement") {
2626
def extensions = project.extensions
2727
doLast {
2828
if (extensions.findByName('dependencyManagement') != null) {
@@ -31,7 +31,7 @@ task doesNotHaveDependencyManagement {
3131
}
3232
}
3333

34-
task hasDependencyManagement {
34+
tasks.register("hasDependencyManagement") {
3535
doLast {
3636
if (!dependencyManagement.managedVersions) {
3737
throw new GradleException('No managed versions have been configured')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8')
2727
}
2828

29-
task kotlinVersion {
29+
tasks.register("kotlinVersion") {
3030
def properties = project.properties
3131
doLast {
3232
def kotlinVersion = properties.getOrDefault('kotlin.version', 'none')

0 commit comments

Comments
 (0)