This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5a1b33173d22e9f1b52cfeda45b7cc12d244e6e9 Author: Goooler <[email protected]> AuthorDate: Fri Jan 26 15:28:33 2024 +0800 Migrate deprecated buildDir --- build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle | 6 +++--- build-logic/src/main/groovy/org.apache.groovy-common.gradle | 2 +- build-logic/src/main/groovy/org.apache.groovy-core.gradle | 2 +- build-logic/src/main/groovy/org.apache.groovy-distribution.gradle | 4 ++-- build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle | 4 ++-- build-logic/src/main/groovy/org.apache.groovy-performance.gradle | 2 +- .../src/main/groovy/org.apache.groovy-published-library.gradle | 2 +- build.gradle | 2 +- gradle/eclipse.gradle | 2 +- subprojects/binary-compatibility/build.gradle | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle index f226c849b3..5bc6188a62 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle @@ -57,14 +57,14 @@ asciidoctor { sources { include '*.adoc' } - outputDir = "$buildDir/asciidoc/html5" + outputDir = layout.buildDirectory.dir("asciidoc/html5") resources { duplicatesStrategy = DuplicatesStrategy.WARN from("${rootProject.projectDir}/src/spec/doc/assets") { include 'css/style.css' } - from("$buildDir/tmp/asciidoctor-assets") + from layout.buildDirectory.dir("tmp/asciidoctor-assets") into 'assets' } forkOptions { @@ -126,7 +126,7 @@ asciidoctor.onlyIf { project.file('src/spec/doc').exists() } def asciidoctorAssets = tasks.register("asciidoctorAssets", Copy) { from project.fileTree('src/spec/doc/assets') - into "$buildDir/tmp/asciidoctor-assets" + into layout.buildDirectory.dir("tmp/asciidoctor-assets") } asciidoctor.dependsOn asciidoctorAssets diff --git a/build-logic/src/main/groovy/org.apache.groovy-common.gradle b/build-logic/src/main/groovy/org.apache.groovy-common.gradle index d518274011..4e23a2178d 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-common.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-common.gradle @@ -34,7 +34,7 @@ plugins { } if (project == rootProject) { - def sharedConfiguration = project.extensions.create('sharedConfiguration', SharedConfiguration, project.objects, rootProject.layout, project.providers, rootProject.buildDir, rootProject.logger, gradle.startParameter) + def sharedConfiguration = project.extensions.create('sharedConfiguration', SharedConfiguration, project.objects, rootProject.layout, project.providers, rootProject.layout.buildDirectory.get().asFile, rootProject.logger, gradle.startParameter) project.extensions.create('versions', Versions, sharedConfiguration, project.providers, project.layout) } diff --git a/build-logic/src/main/groovy/org.apache.groovy-core.gradle b/build-logic/src/main/groovy/org.apache.groovy-core.gradle index 81d27ec052..27121a0c5e 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-core.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-core.gradle @@ -197,7 +197,7 @@ tasks.withType(Test).configureEach { def generateGrammarSourceTask = tasks.named("generateGrammarSource") { maxHeapSize = '1g' outputs.cacheIf { true } - outputDirectory = file("${buildDir}/generated/sources/antlr4") + outputDirectory = layout.buildDirectory.dir("generated/sources/antlr4").get().asFile final PARSER_PACKAGE_NAME = 'org.apache.groovy.parser.antlr4' arguments += ["-visitor", "-no-listener", "-package", PARSER_PACKAGE_NAME] diff --git a/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle b/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle index 0c8563fbcd..655a60ff83 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle @@ -183,7 +183,7 @@ tasks.register('dist') { tasks.register("installGroovy", Sync) { duplicatesStrategy = DuplicatesStrategy.FAIL - def installDir = sharedConfiguration.installationDirectory.orElse(project.layout.buildDir.file("install")) + def installDir = sharedConfiguration.installationDirectory.orElse(layout.buildDirectory.dir("install").get().asFile) description 'Generates a groovy distribution into an install directory' doLast { logger.lifecycle "Groovy installed under ${installDir.get()}" @@ -207,7 +207,7 @@ tasks.named('asciidoctorPdf') { configurations 'asciidocExtensions' logDocuments = true sourceDir = file('src/spec/doc') - outputDir = "$buildDir/asciidocAll/pdf" + outputDir = layout.buildDirectory.dir("asciidocAll/pdf") } // The Groovy distribution module isn't a Java library diff --git a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle index 3d633fc997..f56b4deeee 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle @@ -70,7 +70,7 @@ def sourcesAllJar = tasks.register("sourcesAllJar", Jar) { } def javadocAll = tasks.register("javadocAll", Javadoc) { - destinationDir = file("$buildDir/alljavadoc") + destinationDir = layout.buildDirectory.dir("alljavadoc").get().asFile source configurations.allSources classpath = configurations.allSourcesRuntimeClasspath + configurations.allSources docAggregation.excludedFromJavadocs.each { @@ -84,7 +84,7 @@ def javadocAllJar = tasks.register("javadocAllJar", Jar) { } def groovydocAll = tasks.register("groovydocAll", Groovydoc) { - destinationDir = file("${buildDir}/allgroovydoc") + destinationDir = layout.buildDirectory.dir("allgroovydoc").get().asFile source = configurations.allSources classpath = configurations.allSourcesRuntimeClasspath includeAuthor = false diff --git a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle index 78296b637f..a8b65e75fb 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle @@ -71,7 +71,7 @@ tasks.named('compileJmhGroovy') { tasks.register('displayJmhResults') { dependsOn('jmh') doLast { - println file("$buildDir/results/jmh/results.txt").text + println layout.buildDirectory.file("results/jmh/results.txt").get().asFile.text } } diff --git a/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle b/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle index 6b9a028c94..c21e4b3396 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle @@ -20,7 +20,7 @@ publishing { repositories { maven { name "LocalFile" - url "${rootProject.buildDir}/repo" + url rootProject.layout.buildDirectory.dir("repo").get().asFile.absolutePath } maven { name "Apache" diff --git a/build.gradle b/build.gradle index 24eb9446c3..e4767b13a2 100644 --- a/build.gradle +++ b/build.gradle @@ -245,7 +245,7 @@ sonarqube { property "sonar.organization", "apache" property "sonar.host.url", "https://sonarcloud.io"; property "sonar.cpd.exclusions", "**/*" -// property "sonar.coverage.jacoco.xmlReportPaths", "${rootProject.buildDir}/reports/jacoco/jacocoAllReport/jacocoAllReport.xml" +// property "sonar.coverage.jacoco.xmlReportPaths", layout.buildDirectory.file("reports/jacoco/jacocoAllReport/jacocoAllReport.xml").get().asFile.absolutePath } } diff --git a/gradle/eclipse.gradle b/gradle/eclipse.gradle index 37e5b1bf10..752e8ae9c5 100644 --- a/gradle/eclipse.gradle +++ b/gradle/eclipse.gradle @@ -114,7 +114,7 @@ if (gradle.startParameter.taskNames.any { it =~ /(?i)eclipse/ }) { } } - sourceSets.main.java.srcDirs += "${buildDir}/generated/sources/antlr4" + sourceSets.main.java.srcDirs += layout.buildDirectory.dir('generated/sources/antlr4') eclipseClasspath.dependsOn(generateGrammarSource) } diff --git a/subprojects/binary-compatibility/build.gradle b/subprojects/binary-compatibility/build.gradle index 0131480246..3e665846f2 100644 --- a/subprojects/binary-compatibility/build.gradle +++ b/subprojects/binary-compatibility/build.gradle @@ -54,7 +54,7 @@ rootProject.allprojects { ignoreMissingClasses = true classExcludes = ["**_closure**", "org.codehaus.groovy.runtime.dgm\$**"] packageExcludes = ["**internal**", "groovyjarjar**"] - htmlOutputFile = file("${thisProject.buildDir}/reports/${taskName}.html") + htmlOutputFile = layout.buildDirectory.file("reports/${taskName}.html").get().asFile } checkBinaryCompatibility.configure { dependsOn(singleProjectCheck)
