Skip to content

Commit 2949712

Browse files
committed
[skip ci] specific project name on includedBuild import
1 parent c30e933 commit 2949712

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

grails-forge/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,8 @@ allprojects {
6262
}
6363

6464
tasks.withType(Test).configureEach { Task testTask ->
65-
def grailsIncludedBuildName = rootProject.layout.projectDirectory.dir('..').asFile.name
66-
logger.lifecycle("Configuring test task '${testTask.name}' to depend on included builds with name ${grailsIncludedBuildName}")
6765
testTask.dependsOn(
68-
gradle.includedBuild(grailsIncludedBuildName).task(':publishAllPublicationsToTestCaseMavenRepoRepository'),
66+
gradle.includedBuild('grails-core').task(':publishAllPublicationsToTestCaseMavenRepoRepository'),
6967
gradle.includedBuild('grails-gradle').task(':publishAllPublicationsToTestCaseMavenRepoRepository')
7068
)
7169
}

grails-forge/grails-forge-core/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ dependencies {
7878
def grailsVersionsPath = layout.buildDirectory.dir('version-info')
7979
def grailsVersionInfoTask = tasks.register('grailsVersionInfo', WriteGrailsVersionInfoTask)
8080
grailsVersionInfoTask.configure { WriteGrailsVersionInfoTask it ->
81-
def grailsIncludedBuildName = rootProject.layout.projectDirectory.dir('..').asFile.name
82-
def bomPublicationTask = gradle.includedBuild(grailsIncludedBuildName).task(':grails-bom:generatePomFileForMavenPublication')
81+
def bomPublicationTask = gradle.includedBuild('grails-core').task(':grails-bom:generatePomFileForMavenPublication')
8382
it.dependsOn(bomPublicationTask)
8483
it.bomPublicationFile = rootProject.layout.projectDirectory.file('../grails-bom/build/publications/maven/pom-default.xml')
8584
it.versionsDirectory = grailsVersionsPath
@@ -97,8 +96,7 @@ rocker {
9796
// profile base
9897
TaskProvider<Sync> copyGrailsWrapper = tasks.register('copyGrailsWrapper', Sync)
9998
copyGrailsWrapper.configure { Sync it ->
100-
def grailsIncludedBuildName = rootProject.layout.projectDirectory.dir('..').asFile.name
101-
it.dependsOn(gradle.includedBuild(grailsIncludedBuildName).task(':grails-wrapper:installDist'))
99+
it.dependsOn(gradle.includedBuild('grails-core').task(':grails-wrapper:installDist'))
102100

103101
def wrapperFiles = rootProject.layout.projectDirectory.dir('../grails-wrapper/build/install/apache-grails-wrapper-incubating-bin')
104102
it.inputs.files(wrapperFiles)

grails-forge/settings.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
* under the License.
1818
*/
1919
pluginManagement {
20-
includeBuild('../grails-gradle')
20+
includeBuild('../grails-gradle') {
21+
name = 'grails-gradle'
22+
}
2123
}
2224
plugins {
2325
id 'com.gradle.develocity' version '4.0.1'
@@ -58,5 +60,9 @@ include(
5860
'grails-forge-analytics-postgres'
5961
)
6062

61-
includeBuild('..')
62-
includeBuild('../grails-gradle')
63+
includeBuild('..') {
64+
name = 'grails-core'
65+
}
66+
includeBuild('../grails-gradle') {
67+
name = 'grails-gradle'
68+
}

settings.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ import org.apache.tools.ant.DirectoryScanner
2020
*/
2121

2222
pluginManagement {
23-
includeBuild('./grails-gradle')
23+
includeBuild('./grails-gradle') {
24+
name = 'grails-gradle'
25+
}
2426
}
2527
plugins {
2628
id 'com.gradle.develocity' version '4.0.1'
@@ -387,7 +389,9 @@ project(':grails-test-examples-cache').projectDir = file('grails-test-examples/c
387389
project(':grails-test-examples-views-functional-tests').projectDir = file('grails-test-examples/views-functional-tests')
388390
project(':grails-test-examples-views-functional-tests-plugin').projectDir = file('grails-test-examples/views-functional-tests-plugin')
389391

390-
includeBuild('./grails-gradle')
392+
includeBuild('./grails-gradle') {
393+
name = 'grails-gradle'
394+
}
391395

392396
// Due to https://github.com/gradle/gradle/issues/2986 , we can't change the global exclude for profiles, it must be done everywhere
393397
for (String pattern in DirectoryScanner.defaultExcludes) {

0 commit comments

Comments
 (0)