(groovy) branch GROOVY_4_0_X updated: 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


The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
     new b9a3ebd9d4 remove gradle warnings
b9a3ebd9d4 is described below

commit b9a3ebd9d4d39805b8b76d096051a6d5c7c64298
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Apr 15 09:14:18 2025 +1000

    remove gradle warnings
---
 .../src/main/groovy/org.apache.groovy-asciidoctor.gradle       |  2 +-
 .../apache/groovy/gradle/WriteExtensionDescriptorTask.groovy   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle 
b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
index 7c15f854a4..2acbfec035 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
@@ -63,7 +63,7 @@ asciidoctor {
         from layout.buildDirectory.dir("tmp/asciidoctor-assets")
         into 'assets'
     }
-    forkOptions {
+    jvm {
         jvmArgs("--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", 
"--add-opens", "java.base/java.io=ALL-UNNAMED")
     }
     attributes 'source-highlighter': 'prettify',
diff --git 
a/build-logic/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
 
b/build-logic/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
index 0e021df9b4..fbeefe4fa9 100644
--- 
a/build-logic/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
+++ 
b/build-logic/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
@@ -33,18 +33,20 @@ class WriteExtensionDescriptorTask extends DefaultTask {
     @Input String extensionClasses = ''
     @Input String staticExtensionClasses = ''
     @OutputFile File descriptor = computeDescriptorFile()
+    @Input String moduleName = project.name
+    @Input String moduleVersion = project.version
 
     private File computeDescriptorFile() {
-        def metaInfDir = new 
File("${project.buildDir}/resources/main/META-INF/groovy")
-        return new File(metaInfDir, 
"org.codehaus.groovy.runtime.ExtensionModule")
+        def metaInfDir = 
project.layout.buildDirectory.dir('resources/main/META-INF/groovy').get().asFile
+        return new File(metaInfDir, 
'org.codehaus.groovy.runtime.ExtensionModule')
     }
 
     @TaskAction
     def writeDescriptor() {
         descriptor.parentFile.mkdirs()
         descriptor.withWriter {
-            it << """moduleName=${project.name}
-moduleVersion=${project.version}
+            it << """moduleName=$moduleName
+moduleVersion=$moduleVersion
 extensionClasses=${extensionClasses}
 staticExtensionClasses=${staticExtensionClasses}"""
         }