File tree Expand file tree Collapse file tree 4 files changed +18
-12
lines changed Expand file tree Collapse file tree 4 files changed +18
-12
lines changed Original file line number Diff line number Diff 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 }
Original file line number Diff line number Diff line change @@ -78,8 +78,7 @@ dependencies {
7878def grailsVersionsPath = layout. buildDirectory. dir(' version-info' )
7979def grailsVersionInfoTask = tasks. register(' grailsVersionInfo' , WriteGrailsVersionInfoTask )
8080grailsVersionInfoTask. 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
9897TaskProvider<Sync > copyGrailsWrapper = tasks. register(' copyGrailsWrapper' , Sync )
9998copyGrailsWrapper. 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)
Original file line number Diff line number Diff line change 1717 * under the License.
1818 */
1919pluginManagement {
20- includeBuild(' ../grails-gradle' )
20+ includeBuild(' ../grails-gradle' ) {
21+ name = ' grails-gradle'
22+ }
2123}
2224plugins {
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+ }
Original file line number Diff line number Diff line change @@ -20,7 +20,9 @@ import org.apache.tools.ant.DirectoryScanner
2020 */
2121
2222pluginManagement {
23- includeBuild(' ./grails-gradle' )
23+ includeBuild(' ./grails-gradle' ) {
24+ name = ' grails-gradle'
25+ }
2426}
2527plugins {
2628 id ' com.gradle.develocity' version ' 4.0.1'
@@ -387,7 +389,9 @@ project(':grails-test-examples-cache').projectDir = file('grails-test-examples/c
387389project(' :grails-test-examples-views-functional-tests' ). projectDir = file(' grails-test-examples/views-functional-tests' )
388390project(' :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
393397for (String pattern in DirectoryScanner . defaultExcludes) {
You can’t perform that action at this time.
0 commit comments