This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 495e8e465bb0b0d913164e4721f7ea23acd1912b Author: Paul King <[email protected]> AuthorDate: Tue Apr 15 10:41:15 2025 +1000 formatting: sync with Groovy 5 --- .../src/main/groovy/org.apache.groovy-base.gradle | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle index 5d6df96385..f8d300a8a3 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle @@ -47,16 +47,16 @@ if (sharedConfiguration.hasCodeCoverage.get()) { pluginManager.apply(JacocoPlugin) } -def groovyLibrary = project.extensions.create("groovyLibrary", GroovyLibraryExtension, sharedConfiguration, java) +def groovyLibrary = project.extensions.create('groovyLibrary', GroovyLibraryExtension, sharedConfiguration, java) java { withSourcesJar() withJavadocJar() } -def generateReleaseInfo = tasks.register("generateReleaseInfo", ReleaseInfoGenerator) +def generateReleaseInfo = tasks.register('generateReleaseInfo', ReleaseInfoGenerator) -def groovydocJar = tasks.register("groovydocJar", Jar) { +def groovydocJar = tasks.register('groovydocJar', Jar) { from groovydoc archiveClassifier = 'groovydoc' group = 'build' @@ -70,7 +70,7 @@ configurations { attributes { attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.DOCUMENTATION)) attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL)) - attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType, "groovydoc")) + attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType, 'groovydoc')) attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME)) } outgoing { @@ -85,7 +85,7 @@ configurations { attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.DOCUMENTATION)) attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL)) attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType, DocsType.SOURCES)) - attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, "aggregation")) + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, 'aggregation')) } outgoing { sourceSets.main.java.srcDirs.each { @@ -103,7 +103,7 @@ configurations { attributes { attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY)) attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL)) - attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, "javadocClasspath")) + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, 'javadocClasspath')) } outgoing { artifact tasks.named('jar') @@ -111,12 +111,12 @@ configurations { } codenarc { resolutionStrategy.dependencySubstitution { - substitute module("org.codehaus.groovy:groovy") using project(":") - substitute module("org.codehaus.groovy:groovy-ant") using project(":groovy-ant") - substitute module("org.codehaus.groovy:groovy-templates") using project(":groovy-templates") - substitute module("org.codehaus.groovy:groovy-xml") using project(":groovy-xml") - substitute module("org.codehaus.groovy:groovy-json") using project(":groovy-json") - substitute module("org.codehaus.groovy:groovy-groovydoc") using project(":groovy-groovydoc") + substitute module('org.codehaus.groovy:groovy') using project(':') + substitute module('org.codehaus.groovy:groovy-ant') using project(':groovy-ant') + substitute module('org.codehaus.groovy:groovy-templates') using project(':groovy-templates') + substitute module('org.codehaus.groovy:groovy-xml') using project(':groovy-xml') + substitute module('org.codehaus.groovy:groovy-json') using project(':groovy-json') + substitute module('org.codehaus.groovy:groovy-groovydoc') using project(':groovy-groovydoc') } exclude module: 'groovy-all' @@ -127,7 +127,7 @@ dependencies { compileOnly providers.provider { "com.github.spotbugs:spotbugs-annotations:${versions.spotbugs}" } codenarc "org.codenarc:CodeNarc:${versions.codenarc}" - codenarc project(":groovy-templates") + codenarc project(':groovy-templates') checkstyle "com.puppycrawl.tools:checkstyle:${versions.checkstyle}" spotbugs "com.github.spotbugs:spotbugs:${versions.spotbugs}" @@ -145,7 +145,7 @@ def excludedFromManifest = [ tasks.named('jar') { archiveAppendix = 'raw' - archiveClassifier.set("raw") + archiveClassifier.set('raw') groovyLibrary.configureManifest(manifest, excludedFromManifest) } @@ -176,7 +176,7 @@ tasks.withType(Jar).configureEach {jar -> } } -tasks.register("jarjar", JarJarTask) { +tasks.register('jarjar', JarJarTask) { String projectName = project.name from = jar.archiveFile repackagedLibraries.from configurations.runtimeClasspath.incoming.artifactView { @@ -225,17 +225,17 @@ tasks.withType(Javadoc).configureEach { options.source = sharedConfiguration.targetJavaVersion.get() } -tasks.named("compileTestGroovy") { - options.forkOptions.jvmArgs += ["-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true"] +tasks.named('compileTestGroovy') { + options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true'] } tasks.withType(CodeNarc).configureEach { ignoreFailures = true - configFile = rootProject.file("config/codenarc/codenarc.groovy") + configFile = rootProject.file('config/codenarc/codenarc.groovy') } tasks.withType(SpotBugsTask).configureEach { - excludeFilter = rootProject.file("config/spotbugs/exclude.xml") + excludeFilter = rootProject.file('config/spotbugs/exclude.xml') ignoreFailures = true effort = Effort.valueOf('MAX') maxHeapSize = '2g' @@ -250,14 +250,14 @@ tasks.withType(SpotBugsTask).configureEach { } } -tasks.register("checkstyle") { +tasks.register('checkstyle') { dependsOn tasks.withType(Checkstyle) } tasks.withType(Checkstyle).configureEach {chk -> showViolations = false ignoreFailures = true - configFile = rootProject.file("config/checkstyle/checkstyle.xml") + configFile = rootProject.file('config/checkstyle/checkstyle.xml') configProperties = ['rootProject.projectDir': rootProject.projectDir] def reportFile = layout.buildDirectory.file("reports/checkstyle/${name}.xml") reports { @@ -271,7 +271,7 @@ tasks.withType(Checkstyle).configureEach {chk -> tasks.register("${name}Report", CheckstyleHtmlReport) { dependsOn chk source.from(chk.source) - configFile = rootProject.file("config/checkstyle/checkstyle-report.groovy") + configFile = rootProject.file('config/checkstyle/checkstyle-report.groovy') checkstyleReportFile = reportFile outputFile = layout.buildDirectory.file("reports/checkstyle/${chk.name}.html") } @@ -310,8 +310,8 @@ def shadowRuntime = createConsumableConfiguration(objects, tasks, configurations dependencies { // All Groovy modules depend on the Groovy BOM which itself has constraints on all // Groovy modules, which brings nice alignment features! - groovyApiElements platform(project(":groovy-bom")) - groovyRuntimeElements platform(project(":groovy-bom")) + groovyApiElements platform(project(':groovy-bom')) + groovyRuntimeElements platform(project(':groovy-bom')) } component.addVariantsFromConfiguration(shadowApi) {
