This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 29497129d6f4ae332b90938d75282c73492213c1 Author: James Daugherty <[email protected]> AuthorDate: Tue Jul 8 21:59:45 2025 -0400 [skip ci] specific project name on includedBuild import --- grails-forge/build.gradle | 4 +--- grails-forge/grails-forge-core/build.gradle | 6 ++---- grails-forge/settings.gradle | 12 +++++++++--- settings.gradle | 8 ++++++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/grails-forge/build.gradle b/grails-forge/build.gradle index c01fcc27ce..8fd3e37177 100644 --- a/grails-forge/build.gradle +++ b/grails-forge/build.gradle @@ -62,10 +62,8 @@ allprojects { } tasks.withType(Test).configureEach { Task testTask -> - def grailsIncludedBuildName = rootProject.layout.projectDirectory.dir('..').asFile.name - logger.lifecycle("Configuring test task '${testTask.name}' to depend on included builds with name ${grailsIncludedBuildName}") testTask.dependsOn( - gradle.includedBuild(grailsIncludedBuildName).task(':publishAllPublicationsToTestCaseMavenRepoRepository'), + gradle.includedBuild('grails-core').task(':publishAllPublicationsToTestCaseMavenRepoRepository'), gradle.includedBuild('grails-gradle').task(':publishAllPublicationsToTestCaseMavenRepoRepository') ) } diff --git a/grails-forge/grails-forge-core/build.gradle b/grails-forge/grails-forge-core/build.gradle index 37d220c3fe..39b6961cda 100644 --- a/grails-forge/grails-forge-core/build.gradle +++ b/grails-forge/grails-forge-core/build.gradle @@ -78,8 +78,7 @@ dependencies { def grailsVersionsPath = layout.buildDirectory.dir('version-info') def grailsVersionInfoTask = tasks.register('grailsVersionInfo', WriteGrailsVersionInfoTask) grailsVersionInfoTask.configure { WriteGrailsVersionInfoTask it -> - def grailsIncludedBuildName = rootProject.layout.projectDirectory.dir('..').asFile.name - def bomPublicationTask = gradle.includedBuild(grailsIncludedBuildName).task(':grails-bom:generatePomFileForMavenPublication') + def bomPublicationTask = gradle.includedBuild('grails-core').task(':grails-bom:generatePomFileForMavenPublication') it.dependsOn(bomPublicationTask) it.bomPublicationFile = rootProject.layout.projectDirectory.file('../grails-bom/build/publications/maven/pom-default.xml') it.versionsDirectory = grailsVersionsPath @@ -97,8 +96,7 @@ rocker { // profile base TaskProvider<Sync> copyGrailsWrapper = tasks.register('copyGrailsWrapper', Sync) copyGrailsWrapper.configure { Sync it -> - def grailsIncludedBuildName = rootProject.layout.projectDirectory.dir('..').asFile.name - it.dependsOn(gradle.includedBuild(grailsIncludedBuildName).task(':grails-wrapper:installDist')) + it.dependsOn(gradle.includedBuild('grails-core').task(':grails-wrapper:installDist')) def wrapperFiles = rootProject.layout.projectDirectory.dir('../grails-wrapper/build/install/apache-grails-wrapper-incubating-bin') it.inputs.files(wrapperFiles) diff --git a/grails-forge/settings.gradle b/grails-forge/settings.gradle index f70c4b6dea..3e2c936cfc 100644 --- a/grails-forge/settings.gradle +++ b/grails-forge/settings.gradle @@ -17,7 +17,9 @@ * under the License. */ pluginManagement { - includeBuild('../grails-gradle') + includeBuild('../grails-gradle') { + name = 'grails-gradle' + } } plugins { id 'com.gradle.develocity' version '4.0.1' @@ -58,5 +60,9 @@ include( 'grails-forge-analytics-postgres' ) -includeBuild('..') -includeBuild('../grails-gradle') \ No newline at end of file +includeBuild('..') { + name = 'grails-core' +} +includeBuild('../grails-gradle') { + name = 'grails-gradle' +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 62972ed025..62ee0a9fcc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,7 +20,9 @@ import org.apache.tools.ant.DirectoryScanner */ pluginManagement { - includeBuild('./grails-gradle') + includeBuild('./grails-gradle') { + name = 'grails-gradle' + } } plugins { id 'com.gradle.develocity' version '4.0.1' @@ -387,7 +389,9 @@ project(':grails-test-examples-cache').projectDir = file('grails-test-examples/c project(':grails-test-examples-views-functional-tests').projectDir = file('grails-test-examples/views-functional-tests') project(':grails-test-examples-views-functional-tests-plugin').projectDir = file('grails-test-examples/views-functional-tests-plugin') -includeBuild('./grails-gradle') +includeBuild('./grails-gradle') { + name = 'grails-gradle' +} // Due to https://github.com/gradle/gradle/issues/2986 , we can't change the global exclude for profiles, it must be done everywhere for (String pattern in DirectoryScanner.defaultExcludes) {
