Fix compatibility with Gradle 9

gjvoosten · xzel23 · commit e256391a3636 · 2025-09-27T07:54:01.000+02:00
Project.exec is no longer available in Gradle 9. ExecOperations is the drop-in replacement available since 6.0. Fixes #155 Signed-off-by: Mikhail Lopatkin <me@mlopatkin.name> Signed-off-by: Gertjan van Oosten <gertjan@west.nl>
diff --git a/src/main/groovy/org/beryx/runtime/BaseTask.groovy b/src/main/groovy/org/beryx/runtime/BaseTask.groovy
@@ -19,8 +19,11 @@ import groovy.transform.CompileStatic
 import org.beryx.runtime.data.RuntimePluginExtension
 import org.beryx.runtime.util.Util
 import org.gradle.api.DefaultTask
+import org.gradle.api.model.ObjectFactory
 import org.gradle.api.tasks.Internal
 
+import javax.inject.Inject
+
 import static org.beryx.runtime.util.Util.EXEC_EXTENSION
 
 @CompileStatic
@@ -33,6 +36,11 @@ class BaseTask extends DefaultTask {
         group = 'build'
     }
 
+    @Inject
+    protected ObjectFactory getObjectFactory() {
+        throw new UnsupportedOperationException("Gradle overrides this method when creating the task")
+    }
+
     @Internal
     String getJavaHomeOrDefault() {
         return extension.javaHome.present ? extension.javaHome.get() : defaultJavaHome
diff --git a/src/main/groovy/org/beryx/runtime/JPackageImageTask.groovy b/src/main/groovy/org/beryx/runtime/JPackageImageTask.groovy
@@ -72,7 +72,7 @@ class JPackageImageTask extends BaseTask {
         def jreTask = (JreTask) project.tasks.getByName(RuntimePlugin.TASK_NAME_JRE)
         taskData.configureRuntimeImageDir(jreTask)
 
-        def taskImpl = new JPackageImageTaskImpl(project, taskData)
+        def taskImpl = objectFactory.newInstance(JPackageImageTaskImpl, project, taskData)
         taskImpl.execute()
     }
 }
diff --git a/src/main/groovy/org/beryx/runtime/JPackageTask.groovy b/src/main/groovy/org/beryx/runtime/JPackageTask.groovy
@@ -46,7 +46,7 @@ class JPackageTask extends BaseTask {
         taskData.javaHome = javaHomeOrDefault
         taskData.configureAppImageDir()
 
-        def taskImpl = new JPackageTaskImpl(project, taskData)
+        def taskImpl = objectFactory.newInstance(JPackageTaskImpl, project, taskData)
         taskImpl.execute()
     }
 }
diff --git a/src/main/groovy/org/beryx/runtime/JreTask.groovy b/src/main/groovy/org/beryx/runtime/JreTask.groovy
@@ -79,7 +79,7 @@ class JreTask extends BaseTask {
         taskData.javaHome = javaHome
         taskData.targetPlatforms = targetPlatforms.get()
 
-        def taskImpl = new JreTaskImpl(project, taskData)
+        def taskImpl = objectFactory.newInstance(JreTaskImpl, project, taskData)
         taskImpl.execute()
     }
 }
diff --git a/src/main/groovy/org/beryx/runtime/RuntimeTask.groovy b/src/main/groovy/org/beryx/runtime/RuntimeTask.groovy
@@ -30,6 +30,9 @@ import org.gradle.api.tasks.*
 import org.gradle.api.tasks.application.CreateStartScripts
 import org.gradle.jvm.application.scripts.ScriptGenerator
 import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator
+import org.gradle.process.ExecOperations
+
+import javax.inject.Inject
 
 @CompileStatic
 class RuntimeTask extends BaseTask {
@@ -110,12 +113,17 @@ class RuntimeTask extends BaseTask {
         }
     }
 
+    @Inject
+    protected ExecOperations getExecOperations() {
+        throw new UnsupportedOperationException("Gradle overrides this method when creating the task")
+    }
+
     @CompileDynamic
     private void configureCds() {
         if (cdsData.enabled) {
             this.doLast {
-                project.exec {
-                    commandLine = ["$imageDir/bin/java", "-Xshare:dump"]
+                execOperations.exec {
+                    it.commandLine = ["$imageDir/bin/java", "-Xshare:dump"]
                 }
             }
             System.properties['BADASS_CDS_ARCHIVE_FILE_LINUX'] = cdsData.sharedArchiveFile ?: '$APP_HOME/lib/server/$APP_NAME.jsa'
@@ -135,7 +143,7 @@ class RuntimeTask extends BaseTask {
         taskData.imageDir = imageDir.asFile
         taskData.targetPlatforms = targetPlatforms.get()
 
-        def taskImpl = new RuntimeTaskImpl(project, taskData)
+        def taskImpl = objectFactory.newInstance(RuntimeTaskImpl, project, taskData)
         taskImpl.execute()
     }
 }
diff --git a/src/main/groovy/org/beryx/runtime/RuntimeZipTask.groovy b/src/main/groovy/org/beryx/runtime/RuntimeZipTask.groovy
@@ -55,7 +55,7 @@ class RuntimeZipTask extends BaseTask {
         taskData.targetPlatforms = targetPlatforms.get()
         taskData.imageDir = imageDir.asFile
         taskData.imageZip = imageZip.asFile
-        def taskImpl = new RuntimeZipTaskImpl(project, taskData)
+        def taskImpl = objectFactory.newInstance(RuntimeZipTaskImpl, project, taskData)
         taskImpl.execute()
     }
 }
diff --git a/src/main/groovy/org/beryx/runtime/SuggestModulesTask.groovy b/src/main/groovy/org/beryx/runtime/SuggestModulesTask.groovy
@@ -38,7 +38,7 @@ class SuggestModulesTask extends BaseTask {
     void suggestMergedModuleInfoAction() {
         def taskData = new SuggestModulesData()
         taskData.javaHome = javaHome
-        def taskImpl = new SuggestModulesTaskImpl(project, taskData)
+        def taskImpl = objectFactory.newInstance(SuggestModulesTaskImpl, project, taskData)
         taskImpl.execute()
     }
 }
diff --git a/src/main/groovy/org/beryx/runtime/impl/BaseTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/BaseTaskImpl.groovy
@@ -18,16 +18,31 @@ package org.beryx.runtime.impl
 
 import groovy.transform.CompileStatic
 import org.gradle.api.Project
+import org.gradle.process.ExecOperations
+import org.gradle.process.ExecResult
+import org.gradle.process.ExecSpec
+
+import javax.inject.Inject
 
 @CompileStatic
-class BaseTaskImpl<DATA> {
+abstract class BaseTaskImpl<DATA> {
     static String SEP = File.pathSeparatorChar
 
     final Project project
     final DATA td
 
+    @Inject
+    protected abstract ExecOperations getExecOperations() // Gradle provides implementation
+
     BaseTaskImpl(Project project, DATA td) {
         this.project = project
         this.td = td
     }
+
+    protected ExecResult exec(@DelegatesTo(ExecSpec) Closure<?> spec) {
+        return execOperations.exec {
+            spec.delegate = it
+            spec()
+        }
+    }
 }
diff --git a/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy
@@ -27,18 +27,21 @@ import org.gradle.api.Project
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 
+import javax.inject.Inject
+
 @CompileStatic
-class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
+abstract class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
     private static final Logger LOGGER = Logging.getLogger(JPackageImageTaskImpl.class)
 
+    @Inject
     JPackageImageTaskImpl(Project project, JPackageTaskData taskData) {
         super(project, taskData)
         LOGGER.debug("taskData: $taskData")
     }
 
     @CompileDynamic
     void execute() {
-        def result = project.exec {
+        def result = exec {
             ignoreExitValue = true
             standardOutput = new ByteArrayOutputStream()
 
diff --git a/src/main/groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy
@@ -28,10 +28,13 @@ import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.internal.os.OperatingSystem
 
+import javax.inject.Inject
+
 @CompileStatic
-class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
+abstract class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
     private static final Logger LOGGER = Logging.getLogger(JPackageTaskImpl.class);
 
+    @Inject
     JPackageTaskImpl(Project project, JPackageTaskData taskData) {
         super(project, taskData)
         LOGGER.debug("taskData: $taskData")
@@ -56,7 +59,7 @@ class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                 def subdirs = installerOutDir.listFiles({ f -> f.directory } as FileFilter)
                 if(subdirs) project.delete(subdirs)
             }
-            def result = project.exec {
+            def result = exec {
                 ignoreExitValue = true
                 standardOutput = new ByteArrayOutputStream()
                 project.ext.jpackageInstallerOutput = {
diff --git a/src/main/groovy/org/beryx/runtime/impl/JreTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JreTaskImpl.groovy
@@ -23,9 +23,12 @@ import org.gradle.api.Project
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 
-class JreTaskImpl extends BaseTaskImpl<JreTaskData> {
+import javax.inject.Inject
+
+abstract class JreTaskImpl extends BaseTaskImpl<JreTaskData> {
     private static final Logger LOGGER = Logging.getLogger(JreTaskImpl)
 
+    @Inject
     JreTaskImpl(Project project, JreTaskData taskData) {
         super(project, taskData)
         LOGGER.info("taskData: $taskData")
@@ -57,7 +60,7 @@ class JreTaskImpl extends BaseTaskImpl<JreTaskData> {
                        '--add-modules', modules.join(','),
                        '--output', jreDir]
         LOGGER.info("Executing: $cmd")
-        def result = project.exec {
+        def result = exec {
             ignoreExitValue = true
             standardOutput = new ByteArrayOutputStream()
             project.ext.jlinkOutput = {
diff --git a/src/main/groovy/org/beryx/runtime/impl/RuntimeTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/RuntimeTaskImpl.groovy
@@ -21,9 +21,12 @@ import org.gradle.api.Project
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 
-class RuntimeTaskImpl extends BaseTaskImpl<RuntimeTaskData> {
+import javax.inject.Inject
+
+abstract class RuntimeTaskImpl extends BaseTaskImpl<RuntimeTaskData> {
     private static final Logger LOGGER = Logging.getLogger(RuntimeTaskImpl)
 
+    @Inject
     RuntimeTaskImpl(Project project, RuntimeTaskData taskData) {
         super(project, taskData)
         LOGGER.info("taskData: $taskData")
diff --git a/src/main/groovy/org/beryx/runtime/impl/RuntimeZipTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/RuntimeZipTaskImpl.groovy
@@ -20,9 +20,12 @@ import org.gradle.api.Project
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 
-class RuntimeZipTaskImpl extends BaseTaskImpl<RuntimeZipTaskData> {
+import javax.inject.Inject
+
+abstract class RuntimeZipTaskImpl extends BaseTaskImpl<RuntimeZipTaskData> {
     private static final Logger LOGGER = Logging.getLogger(RuntimeZipTaskImpl)
 
+    @Inject
     RuntimeZipTaskImpl(Project project, RuntimeZipTaskData taskData) {
         super(project, taskData)
         LOGGER.info("taskData: $taskData")
diff --git a/src/main/groovy/org/beryx/runtime/impl/SuggestModulesTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/SuggestModulesTaskImpl.groovy
@@ -20,10 +20,14 @@ import org.beryx.runtime.util.SuggestedModulesBuilder
 import org.gradle.api.Project
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
+import org.gradle.process.ExecOperations
 
-class SuggestModulesTaskImpl extends BaseTaskImpl<SuggestModulesData> {
+import javax.inject.Inject
+
+abstract class SuggestModulesTaskImpl extends BaseTaskImpl<SuggestModulesData> {
     private static final Logger LOGGER = Logging.getLogger(SuggestModulesTaskImpl)
 
+    @Inject
     SuggestModulesTaskImpl(Project project, SuggestModulesData taskData) {
         super(project, taskData)
         LOGGER.info("taskData: $taskData")

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class JPackageImageTask extends BaseTask {`
`72`	`72`	`def jreTask = (JreTask) project.tasks.getByName(RuntimePlugin.TASK_NAME_JRE)`
`73`	`73`	`taskData.configureRuntimeImageDir(jreTask)`
`74`	`74`
`75`		`- def taskImpl = new JPackageImageTaskImpl(project, taskData)`
	`75`	`+ def taskImpl = objectFactory.newInstance(JPackageImageTaskImpl, project, taskData)`
`76`	`76`	`taskImpl.execute()`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class JPackageTask extends BaseTask {`
`46`	`46`	`taskData.javaHome = javaHomeOrDefault`
`47`	`47`	`taskData.configureAppImageDir()`
`48`	`48`
`49`		`- def taskImpl = new JPackageTaskImpl(project, taskData)`
	`49`	`+ def taskImpl = objectFactory.newInstance(JPackageTaskImpl, project, taskData)`
`50`	`50`	`taskImpl.execute()`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class JreTask extends BaseTask {`
`79`	`79`	`taskData.javaHome = javaHome`
`80`	`80`	`taskData.targetPlatforms = targetPlatforms.get()`
`81`	`81`
`82`		`- def taskImpl = new JreTaskImpl(project, taskData)`
	`82`	`+ def taskImpl = objectFactory.newInstance(JreTaskImpl, project, taskData)`
`83`	`83`	`taskImpl.execute()`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ import org.gradle.api.tasks.*`
`30`	`30`	`import org.gradle.api.tasks.application.CreateStartScripts`
`31`	`31`	`import org.gradle.jvm.application.scripts.ScriptGenerator`
`32`	`32`	`import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator`
	`33`	`+import org.gradle.process.ExecOperations`
	`34`	`+`
	`35`	`+import javax.inject.Inject`
`33`	`36`
`34`	`37`	`@CompileStatic`
`35`	`38`	`class RuntimeTask extends BaseTask {`
`@@ -110,12 +113,17 @@ class RuntimeTask extends BaseTask {`
`110`	`113`	`}`
`111`	`114`	`}`
`112`	`115`
	`116`	`+ @Inject`
	`117`	`+ protected ExecOperations getExecOperations() {`
	`118`	`+ throw new UnsupportedOperationException("Gradle overrides this method when creating the task")`
	`119`	`+ }`
	`120`	`+`
`113`	`121`	`@CompileDynamic`
`114`	`122`	`private void configureCds() {`
`115`	`123`	`if (cdsData.enabled) {`
`116`	`124`	`this.doLast {`
`117`		`- project.exec {`
`118`		`- commandLine = ["$imageDir/bin/java", "-Xshare:dump"]`
	`125`	`+ execOperations.exec {`
	`126`	`+ it.commandLine = ["$imageDir/bin/java", "-Xshare:dump"]`
`119`	`127`	`}`
`120`	`128`	`}`
`121`	`129`	`System.properties['BADASS_CDS_ARCHIVE_FILE_LINUX'] = cdsData.sharedArchiveFile ?: '$APP_HOME/lib/server/$APP_NAME.jsa'`
`@@ -135,7 +143,7 @@ class RuntimeTask extends BaseTask {`
`135`	`143`	`taskData.imageDir = imageDir.asFile`
`136`	`144`	`taskData.targetPlatforms = targetPlatforms.get()`
`137`	`145`
`138`		`- def taskImpl = new RuntimeTaskImpl(project, taskData)`
	`146`	`+ def taskImpl = objectFactory.newInstance(RuntimeTaskImpl, project, taskData)`
`139`	`147`	`taskImpl.execute()`
`140`	`148`	`}`
`141`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class RuntimeZipTask extends BaseTask {`
`55`	`55`	`taskData.targetPlatforms = targetPlatforms.get()`
`56`	`56`	`taskData.imageDir = imageDir.asFile`
`57`	`57`	`taskData.imageZip = imageZip.asFile`
`58`		`- def taskImpl = new RuntimeZipTaskImpl(project, taskData)`
	`58`	`+ def taskImpl = objectFactory.newInstance(RuntimeZipTaskImpl, project, taskData)`
`59`	`59`	`taskImpl.execute()`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class SuggestModulesTask extends BaseTask {`
`38`	`38`	`void suggestMergedModuleInfoAction() {`
`39`	`39`	`def taskData = new SuggestModulesData()`
`40`	`40`	`taskData.javaHome = javaHome`
`41`		`- def taskImpl = new SuggestModulesTaskImpl(project, taskData)`
	`41`	`+ def taskImpl = objectFactory.newInstance(SuggestModulesTaskImpl, project, taskData)`
`42`	`42`	`taskImpl.execute()`
`43`	`43`	`}`
`44`	`44`	`}`