Skip to content

Commit 526d332

Browse files
committed
minor refactor: use later gradle syntax
1 parent d43e551 commit 526d332

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Diff for: build-logic/src/main/groovy/org.apache.groovy-core.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ interface CoreServices {
162162
def execOperations = objects.newInstance(CoreServices).execOperations
163163

164164
tasks.named('compileJava') {
165-
options.fork(memoryMaximumSize: sharedConfiguration.javacMaxMemory.get())
165+
options.fork = true
166+
options.forkOptions.memoryMaximumSize = sharedConfiguration.javacMaxMemory.get()
166167
inputs.files(configurations.tools)
167168

168169
doLast {
@@ -175,7 +176,8 @@ tasks.named('compileJava') {
175176
}
176177

177178
tasks.named('compileTestGroovy') {
178-
groovyOptions.fork(memoryMaximumSize: groovycTest_mx)
179+
groovyOptions.fork = true
180+
groovyOptions.forkOptions.memoryMaximumSize = groovycTest_mx
179181
}
180182

181183
tasks.register('checkCompatibility') {

Diff for: build-logic/src/main/groovy/org.apache.groovy-internal.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ tasks.withType(AbstractCompile).configureEach {
7777
}
7878

7979
tasks.withType(GroovyCompile).configureEach {
80+
groovyOptions.fork = true
8081
groovyOptions.forkOptions.jvmArgs += ["-Dgroovy.antlr4.cache.threshold=0", "-Dgroovy.target.bytecode=${sharedConfiguration.groovyTargetBytecodeVersion.get()}" as String]
81-
groovyOptions.fork(memoryMaximumSize: sharedConfiguration.groovycMaxMemory.get())
82+
groovyOptions.forkOptions.memoryMaximumSize = sharedConfiguration.groovycMaxMemory.get()
8283
groovyClasspath = configurations.groovyCompilerClasspath
8384

8485
// See also https://docs.gradle.org/current/userguide/groovy_plugin.html#sec:incremental_groovy_compilation

Diff for: subprojects/groovy-binary/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ distribution {
9797
into('bin') {
9898
from(rootProject.file('src/bin')) {
9999
filter(ReplaceTokens, tokens: [GROOVYJAR: "groovy-${versions.groovy}.jar".toString()])
100-
fileMode = 0755
100+
filePermissions { unix('rwxr-xr-x') }
101101
exclude 'groovy.icns'
102102
}
103-
from projects.groovyDocgenerator.dependencyProject.file('src/main/resources/org/apache/groovy/docgenerator/groovy.ico')
103+
from project.project(projects.groovyDocgenerator.path).file('src/main/resources/org/apache/groovy/docgenerator/groovy.ico')
104104
}
105105
into('licenses') {
106106
from rootProject.file('licenses')

0 commit comments

Comments
 (0)