This is an automated email from the ASF dual-hosted git repository. matrei pushed a commit to branch post-gradle-merge in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 22c6821756369d05ede2226a050079474e35550d Author: Mattias Reichel <[email protected]> AuthorDate: Wed Apr 16 12:11:17 2025 +0200 build: whitespace, formatting and cleanup --- grails-bom/build.gradle | 14 +++++--------- grails-databinding/build.gradle | 2 +- grails-gradle/bom/build.gradle | 4 ++-- .../multiple-source-sets/build.gradle | 20 +++++++++++--------- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle index 1bbc4b4760..241bc16d27 100644 --- a/grails-bom/build.gradle +++ b/grails-bom/build.gradle @@ -15,15 +15,13 @@ javaPlatform { allowDependencies() } - - ext { isReleaseBuild = System.getenv('GRAILS_PUBLISH_RELEASE') == 'true' isPublishedExternal = System.getenv().containsKey('NEXUS_PUBLISH_STAGING_PROFILE_ID') } dependencies { - api platform("org.apache.grails:grails-gradle-bom:${projectVersion}"), { + api platform("org.apache.grails:grails-gradle-bom:$projectVersion"), { exclude group: 'org.codehaus.groovy' exclude group: 'org.spockframework' } @@ -100,11 +98,9 @@ dependencies { if (subproject.path == project.path || subproject.name in testProjects) { continue // ignore self & test projects } - - api project(":${subproject.path}") + api project(":$subproject.path") } } - } tasks.register('validateNoSnapshotDependencies') { @@ -120,10 +116,10 @@ tasks.register('validateNoSnapshotDependencies') { } if (ext.isReleaseBuild && ext.isPublishedExternal) { - tasks.named('generateMetadataFileForMavenPublication').configure { + tasks.named('generateMetadataFileForMavenPublication') { dependsOn(tasks.named('validateNoSnapshotDependencies')) } - tasks.named('generatePomFileForMavenPublication').configure { + tasks.named('generatePomFileForMavenPublication') { dependsOn(tasks.named('validateNoSnapshotDependencies')) } } @@ -166,7 +162,7 @@ Closure determinePropertyName = { String groupId, String artifactId, String vers } ext { - pomDescription = "Grails BOM (Bill of Materials) for managing dependency versions used by Grails Projects" + pomDescription = 'Grails BOM (Bill of Materials) for managing dependency versions used by Grails Projects' pomCustomization = { -> def root = asNode() diff --git a/grails-databinding/build.gradle b/grails-databinding/build.gradle index fbcaddec9c..2f6154a276 100644 --- a/grails-databinding/build.gradle +++ b/grails-databinding/build.gradle @@ -56,7 +56,7 @@ dependencies { testImplementation 'org.objenesis:objenesis' } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { dependsOn tasks.named('jar') } diff --git a/grails-gradle/bom/build.gradle b/grails-gradle/bom/build.gradle index 255f1ba0f2..1df9834663 100644 --- a/grails-gradle/bom/build.gradle +++ b/grails-gradle/bom/build.gradle @@ -70,10 +70,10 @@ tasks.register('validateNoSnapshotDependencies') { } if (ext.isReleaseBuild && ext.isPublishedExternal) { - tasks.named('generateMetadataFileForMavenPublication').configure { + tasks.named('generateMetadataFileForMavenPublication') { dependsOn(tasks.named('validateNoSnapshotDependencies')) } - tasks.named('generatePomFileForMavenPublication').configure { + tasks.named('generatePomFileForMavenPublication') { dependsOn(tasks.named('validateNoSnapshotDependencies')) } } diff --git a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multiple-source-sets/build.gradle b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multiple-source-sets/build.gradle index 0b4b09fa82..4a35ec21f7 100644 --- a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multiple-source-sets/build.gradle +++ b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multiple-source-sets/build.gradle @@ -16,8 +16,8 @@ allprojects { } } -version "${projectVersion}" -group "org.grails.example" +version = projectVersion +group = 'org.grails.example' apply plugin: 'java-library' apply plugin: 'groovy' @@ -36,19 +36,21 @@ sourceSets { } } -def copyOtherClasses = project.tasks.register('copyOtherClasses', Copy) { - it.from sourceSets.other.output - it.into project.layout.buildDirectory.dir("classes/groovy/main") +tasks.register('copyOtherClasses', Copy) { + from sourceSets.other.output + into project.layout.buildDirectory.dir('classes/groovy/main') } -def taskContainer = project.tasks -taskContainer.named('classes').configure { it.dependsOn(copyOtherClasses) } +tasks.named('classes') { + dependsOn(tasks.named('copyOtherClasses')) +} -taskContainer.withType(JavaExec).configureEach { - it.classpath += sourceSets.other.output +tasks.withType(JavaExec).configureEach { + classpath += sourceSets.other.output } apply plugin: 'org.apache.grails.gradle.grails-publish' + grailsPublish { githubSlug = 'apache/grails-cores' license {
