(groovy) branch master updated: minor refactor: use later gradle syntax

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 526d332310 minor refactor: use later gradle syntax
526d332310 is described below

commit 526d332310e93980ff146792ec6fc9579196744c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Dec 2 17:35:33 2024 +1000

    minor refactor: use later gradle syntax
---
 build-logic/src/main/groovy/org.apache.groovy-core.gradle     | 6 ++++--
 build-logic/src/main/groovy/org.apache.groovy-internal.gradle | 3 ++-
 subprojects/groovy-binary/build.gradle                        | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-core.gradle 
b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
index e0d9526b14..a669c72e95 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-core.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
@@ -162,7 +162,8 @@ interface CoreServices {
 def execOperations = objects.newInstance(CoreServices).execOperations
 
 tasks.named('compileJava') {
-    options.fork(memoryMaximumSize: sharedConfiguration.javacMaxMemory.get())
+    options.fork = true
+    options.forkOptions.memoryMaximumSize = 
sharedConfiguration.javacMaxMemory.get()
     inputs.files(configurations.tools)
 
     doLast {
@@ -175,7 +176,8 @@ tasks.named('compileJava') {
 }
 
 tasks.named('compileTestGroovy') {
-    groovyOptions.fork(memoryMaximumSize: groovycTest_mx)
+    groovyOptions.fork = true
+    groovyOptions.forkOptions.memoryMaximumSize = groovycTest_mx
 }
 
 tasks.register('checkCompatibility') {
diff --git a/build-logic/src/main/groovy/org.apache.groovy-internal.gradle 
b/build-logic/src/main/groovy/org.apache.groovy-internal.gradle
index 502e8ca2fa..3b55838706 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-internal.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-internal.gradle
@@ -77,8 +77,9 @@ tasks.withType(AbstractCompile).configureEach {
 }
 
 tasks.withType(GroovyCompile).configureEach {
+    groovyOptions.fork = true
     groovyOptions.forkOptions.jvmArgs += ["-Dgroovy.antlr4.cache.threshold=0", 
"-Dgroovy.target.bytecode=${sharedConfiguration.groovyTargetBytecodeVersion.get()}"
 as String]
-    groovyOptions.fork(memoryMaximumSize: 
sharedConfiguration.groovycMaxMemory.get())
+    groovyOptions.forkOptions.memoryMaximumSize = 
sharedConfiguration.groovycMaxMemory.get()
     groovyClasspath = configurations.groovyCompilerClasspath
 
     // See also 
https://docs.gradle.org/current/userguide/groovy_plugin.html#sec:incremental_groovy_compilation
diff --git a/subprojects/groovy-binary/build.gradle 
b/subprojects/groovy-binary/build.gradle
index 951ebc1542..792902f5e6 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -97,10 +97,10 @@ distribution {
         into('bin') {
             from(rootProject.file('src/bin')) {
                 filter(ReplaceTokens, tokens: [GROOVYJAR: 
"groovy-${versions.groovy}.jar".toString()])
-                fileMode = 0755
+                filePermissions { unix('rwxr-xr-x') }
                 exclude 'groovy.icns'
             }
-            from 
projects.groovyDocgenerator.dependencyProject.file('src/main/resources/org/apache/groovy/docgenerator/groovy.ico')
+            from 
project.project(projects.groovyDocgenerator.path).file('src/main/resources/org/apache/groovy/docgenerator/groovy.ico')
         }
         into('licenses') {
             from rootProject.file('licenses')