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 b99958248807b72848b9c3fdebfaa492686ce5a9 Author: Mattias Reichel <[email protected]> AuthorDate: Wed Apr 16 09:17:21 2025 +0200 chore(build): whitespace Use space after `if`, `for` and `while`. --- gradle/functional-test-config.gradle | 2 +- grails-bom/build.gradle | 16 ++++++++-------- grails-dependencies/build.gradle | 2 +- grails-gradle/bom/build.gradle | 16 ++++++++-------- .../build.gradle | 2 +- .../multi-project-plugins-applied-child/build.gradle | 2 +- .../multi-project-plugins-applied-parent/build.gradle | 2 +- grails-test-suite-persistence/build.gradle | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gradle/functional-test-config.gradle b/gradle/functional-test-config.gradle index ce5611a2da..05bad6a3bd 100644 --- a/gradle/functional-test-config.gradle +++ b/gradle/functional-test-config.gradle @@ -22,7 +22,7 @@ configurations.configureEach { } // work around for parallel builds due to https://github.com/bertramdev/asset-pipeline/issues/177 -if('assetCompile' in tasks.names) { +if ('assetCompile' in tasks.names) { tasks.named('assetCompile') { Task task -> task.outputs.dir rootProject.layout.buildDirectory.dir('asset-serialize') } diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle index 64c43bf55d..1bbc4b4760 100644 --- a/grails-bom/build.gradle +++ b/grails-bom/build.gradle @@ -97,7 +97,7 @@ dependencies { api bomDependencies['views-markup'] for (Project subproject : rootProject.subprojects) { - if(subproject.path == project.path || subproject.name in testProjects) { + if (subproject.path == project.path || subproject.name in testProjects) { continue // ignore self & test projects } @@ -119,7 +119,7 @@ tasks.register('validateNoSnapshotDependencies') { } } -if(ext.isReleaseBuild && ext.isPublishedExternal) { +if (ext.isReleaseBuild && ext.isPublishedExternal) { tasks.named('generateMetadataFileForMavenPublication').configure { dependsOn(tasks.named('validateNoSnapshotDependencies')) } @@ -132,7 +132,7 @@ Closure determinePropertyName = { String groupId, String artifactId, String vers Map<String, String> toSearch = isBom ? bomPlatformDependencies : bomDependencies Map.Entry<String, String> found = toSearch.entrySet().find { "$groupId:$artifactId:$version" as String == it.value as String } - if(!found) { + if (!found) { return null } @@ -152,9 +152,9 @@ Closure determinePropertyName = { String groupId, String artifactId, String vers .replace('grails-testing-support-web', 'gsp') .replace('views-markup', 'gsp') .replace('views-gson', 'gsp') - while(possibleKey != null) { + while (possibleKey != null) { String propertyName = "${possibleKey}.version" as String - if(versions.containsKey(propertyName)) { + if (versions.containsKey(propertyName)) { return propertyName } @@ -182,13 +182,13 @@ ext { boolean isBom = dep.scope.text().trim() == 'import' String inlineVersion = dep.version.text().trim() - if(inlineVersion == 'null') { + if (inlineVersion == 'null') { inlineVersion = null } if (inlineVersion) { String propertyName = determinePropertyName(groupId, artifactId, inlineVersion, isBom) - if(propertyName) { + if (propertyName) { // Replace the version in the pom with a property reference String propertyReference = "\${${propertyName}}" dep.version[0].value = propertyReference @@ -197,7 +197,7 @@ ext { pomProperties.put(propertyName, inlineVersion) } } - else if(!inlineVersion) { + else if (!inlineVersion) { throw new GradleException("Dependency $groupId:$artifactId does not have a version.") } } diff --git a/grails-dependencies/build.gradle b/grails-dependencies/build.gradle index 4f64313f6c..b3870ba03b 100644 --- a/grails-dependencies/build.gradle +++ b/grails-dependencies/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation platform(project(':grails-bom')) configurations.each { String configuration, List<String> deps -> deps.each { - if(it.startsWith(':')) { + if (it.startsWith(':')) { add(configuration, project(it)) } else { diff --git a/grails-gradle/bom/build.gradle b/grails-gradle/bom/build.gradle index c0492a4425..255f1ba0f2 100644 --- a/grails-gradle/bom/build.gradle +++ b/grails-gradle/bom/build.gradle @@ -48,7 +48,7 @@ dependencies { api bomDependencies['springloaded'] for (Project subproject : rootProject.subprojects) { - if(subproject.path == project.path) { + if (subproject.path == project.path) { continue // ignore self } @@ -69,7 +69,7 @@ tasks.register('validateNoSnapshotDependencies') { } } -if(ext.isReleaseBuild && ext.isPublishedExternal) { +if (ext.isReleaseBuild && ext.isPublishedExternal) { tasks.named('generateMetadataFileForMavenPublication').configure { dependsOn(tasks.named('validateNoSnapshotDependencies')) } @@ -82,15 +82,15 @@ Closure determinePropertyName = { String groupId, String artifactId, String vers Map<String, String> toSearch = isBom ? bomPlatformDependencies : bomDependencies Map.Entry<String, String> found = toSearch.entrySet().find { "$groupId:$artifactId:$version" as String == it.value as String } - if(!found) { + if (!found) { return null } Map<String, String> versions = bomDependencyVersions String possibleKey = found.key.toString() - while(possibleKey != null) { + while (possibleKey != null) { String propertyName = "${possibleKey}.version" as String - if(versions.containsKey(propertyName)) { + if (versions.containsKey(propertyName)) { return propertyName } @@ -142,13 +142,13 @@ publishing { boolean isBom = dep.scope.text().trim() == 'import' String inlineVersion = dep.version.text().trim() - if(inlineVersion == 'null') { + if (inlineVersion == 'null') { inlineVersion = null } if (inlineVersion) { String propertyName = determinePropertyName(groupId, artifactId, inlineVersion, isBom) - if(propertyName) { + if (propertyName) { // Replace the version in the pom with a property reference String propertyReference = "\${${propertyName}}" dep.version[0].value = propertyReference @@ -157,7 +157,7 @@ publishing { pomProperties.put(propertyName, inlineVersion) } } - else if(!inlineVersion) { + else if (!inlineVersion) { throw new GradleException("Dependency $groupId:$artifactId does not have a version.") } } diff --git a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/legacy-apply/multi-project-no-subproject-build-gradle-publish-per-project/build.gradle b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/legacy-apply/multi-project-no-subproject-build-gradle-publish-per-project/build.gradle index 7931ae3cbb..508b4aa846 100644 --- a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/legacy-apply/multi-project-no-subproject-build-gradle-publish-per-project/build.gradle +++ b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/legacy-apply/multi-project-no-subproject-build-gradle-publish-per-project/build.gradle @@ -28,7 +28,7 @@ subprojects { project -> implementation "org.apache.groovy:groovy:$groovyVersion" } - if(project.name == "subproject1") { + if (project.name == "subproject1") { apply plugin: 'org.apache.grails.gradle.grails-publish' grailsPublish { githubSlug = 'apache/grails-cores' diff --git a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-child/build.gradle b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-child/build.gradle index 67e33d6237..7133cd70b9 100644 --- a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-child/build.gradle +++ b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-child/build.gradle @@ -21,7 +21,7 @@ subprojects { project -> maven { url = 'https://repository.apache.org/content/repositories/snapshots' } } - if(project.name == "subproject1") { + if (project.name == "subproject1") { apply plugin: 'org.apache.grails.gradle.grails-publish' grailsPublish { githubSlug = 'apache/grails-cores' diff --git a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-parent/build.gradle b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-parent/build.gradle index 7931ae3cbb..508b4aa846 100644 --- a/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-parent/build.gradle +++ b/grails-gradle/plugins/src/e2eTest/resources/publish-projects/other-artifacts/multi-project-plugins-applied-parent/build.gradle @@ -28,7 +28,7 @@ subprojects { project -> implementation "org.apache.groovy:groovy:$groovyVersion" } - if(project.name == "subproject1") { + if (project.name == "subproject1") { apply plugin: 'org.apache.grails.gradle.grails-publish' grailsPublish { githubSlug = 'apache/grails-cores' diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle index 736f6070df..bdf5843d5c 100644 --- a/grails-test-suite-persistence/build.gradle +++ b/grails-test-suite-persistence/build.gradle @@ -71,7 +71,7 @@ dependencies { test { maxParallelForks = 2 forkEvery = isCiBuild ? 25 : 100 - if(!isCiBuild) { + if (!isCiBuild) { maxHeapSize = '2048m' } excludes = ['**/GrailsDomainBinderTests.class',
