Skip to content

Commit baf793d

Browse files
committed
later gradle syntax
1 parent 1ae3888 commit baf793d

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

build-logic/src/main/groovy/org/apache/groovy/gradle/DgmConverter.groovy

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ import org.gradle.api.DefaultTask
2424
import org.gradle.api.file.ConfigurableFileCollection
2525
import org.gradle.api.file.ConfigurableFileTree
2626
import org.gradle.api.file.DirectoryProperty
27+
import org.gradle.api.model.ObjectFactory
28+
import org.gradle.api.provider.Provider
2729
import org.gradle.api.tasks.CacheableTask
2830
import org.gradle.api.tasks.Classpath
31+
import org.gradle.api.tasks.Input
2932
import org.gradle.api.tasks.InputFiles
3033
import org.gradle.api.tasks.OutputDirectory
3134
import org.gradle.api.tasks.PathSensitive
@@ -41,6 +44,7 @@ class DgmConverter extends DefaultTask {
4144

4245
private final ExecOperations execOperations
4346

47+
@Input Provider<String> groovyTargetBytecodeVersion = project.rootProject.extensions.getByType(SharedConfiguration).groovyTargetBytecodeVersion
4448

4549
@OutputDirectory
4650
final DirectoryProperty outputDirectory
@@ -54,13 +58,13 @@ class DgmConverter extends DefaultTask {
5458
final ConfigurableFileCollection classpath
5559

5660
@Inject
57-
DgmConverter(ExecOperations execOperations) {
61+
DgmConverter(ExecOperations execOperations, ObjectFactory objects) {
5862
description = 'Generates DGM info file required for faster startup.'
5963
this.execOperations = execOperations
60-
classpath = project.objects.fileCollection()
61-
sources = project.objects.fileTree()
62-
outputDirectory = project.objects.directoryProperty().convention(
63-
project.layout.buildDirectory.dir("dgm")
64+
classpath = objects.fileCollection()
65+
sources = objects.fileTree()
66+
outputDirectory = objects.directoryProperty().convention(
67+
project.layout.buildDirectory.dir("dgm")
6468
)
6569
}
6670

@@ -71,7 +75,7 @@ class DgmConverter extends DefaultTask {
7175
execOperations.javaexec {
7276
it.mainClass.set('org.codehaus.groovy.tools.DgmConverter')
7377
it.classpath = this.classpath
74-
it.jvmArgs("-Dgroovy.target.bytecode=${project.rootProject.extensions.getByType(SharedConfiguration).groovyTargetBytecodeVersion.get()}" as String)
78+
it.jvmArgs("-Dgroovy.target.bytecode=${groovyTargetBytecodeVersion.get()}" as String)
7579
it.args('--info', outputDirectory.asFile.get().absolutePath)
7680
}
7781
}

0 commit comments

Comments
 (0)