(groovy) 05/05: remove gradle warnings

[paulk]

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 9a1d1e9e90af6a4847dd1250a2f49fb150e52362
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Apr 15 08:51:03 2025 +1000

    remove gradle warnings
---
 build-logic/src/main/groovy/org.apache.groovy-base.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 602c8eee8c..5d6df96385 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -177,6 +177,7 @@ tasks.withType(Jar).configureEach {jar ->
 }
 
 tasks.register("jarjar", JarJarTask) {
+    String projectName = project.name
     from = jar.archiveFile
     repackagedLibraries.from 
configurations.runtimeClasspath.incoming.artifactView {
         componentFilter { component ->
@@ -207,9 +208,9 @@ tasks.register("jarjar", JarJarTask) {
     outputFile = tasks.named('jar').flatMap { 
layout.buildDirectory.file("libs/${it.archiveBaseName.get()}-${it.archiveVersion.get()}${(it.archiveClassifier.get()
 && it.archiveClassifier.get() != 'raw') ? '-' + it.archiveClassifier.get() : 
''}.jar") }
 
     withManifest {
-        def extras = project.name == 'groovy' ? ['Main-Class': 
'groovy.ui.GroovyMain'] : [:]
-        def moduleName = "org.apache.${project.name.replace('-', '.')}"
-        attributes('Automatic-Module-Name': moduleName, 'Bundle-Name': 'Groovy 
module: ' + project.name, *:extras)
+        def extras = projectName == 'groovy' ? ['Main-Class': 
'groovy.ui.GroovyMain'] : [:]
+        def moduleName = "org.apache.${projectName.replace('-', '.')}"
+        attributes('Automatic-Module-Name': moduleName, 'Bundle-Name': 'Groovy 
module: ' + projectName, *:extras)
         groovyLibrary.configureManifest(it, excludedFromManifest)
         classpath = configurations.runtimeClasspath
     }