Bring back jvmoptions

Author: rpalcolea

build.gradle

@@ -39,7 +39,6 @@ dependencies {
     implementation 'org.clojure:clojure:1.10.3'
     implementation 'org.clojure:tools.namespace:1.1.0'
     implementation 'us.bpsm:edn-java:0.4.3'
-
     testImplementation gradleTestKit()
     testImplementation 'com.netflix.nebula:nebula-publishing-plugin:5.+'
 }

src/main/groovy/nebula/plugin/clojuresque/tasks/ClojureRun.groovy

@@ -1,6 +1,7 @@
 package nebula.plugin.clojuresque.tasks
 
 import nebula.plugin.clojuresque.Util
+import nebula.plugin.utils.tasks.ConfigureUtil
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.tasks.*
@@ -28,6 +29,9 @@ abstract class ClojureRun extends ClojureSourceTask {
 
     private final ObjectFactory objects
 
+    @Internal
+    def jvmOptions = {}
+
     @Inject
     ClojureRun(ExecOperations execOperations, ObjectFactory objects) {
         this.execOperations = execOperations
@@ -51,6 +55,7 @@ abstract class ClojureRun extends ClojureSourceTask {
         execOperations.javaexec {
             setMainClass("clojure.main")
             args('-')
+            ConfigureUtil.configure delegate, jvmOptions
             classpath = objectFactory.fileCollection().from(
                 this.srcDirs,
                 this.classpath

src/main/groovy/nebula/plugin/clojuresque/tasks/ClojureTest.groovy

@@ -13,6 +13,7 @@
 package nebula.plugin.clojuresque.tasks
 
 import nebula.plugin.clojuresque.Util
+import nebula.plugin.utils.tasks.ConfigureUtil
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
@@ -53,6 +54,8 @@ abstract class ClojureTest extends ClojureSourceTask {
 
     private final ObjectFactory objects
 
+    @Internal
+    def jvmOptions = {}
 
     @Inject
     ClojureTest(ExecOperations execOperations, ObjectFactory objects) {
@@ -87,6 +90,7 @@ abstract class ClojureTest extends ClojureSourceTask {
         execOperations.javaexec {
             setMainClass("clojure.main")
             args('-')
+            ConfigureUtil.configure delegate, jvmOptions
             classpath = objectFactory.fileCollection().from(
                 this.srcDirs,
                 this.outputDir,

src/main/groovy/nebula/plugin/utils/tasks/ConfigureUtil.groovy

@@ -0,0 +1,32 @@
+package nebula.plugin.utils.tasks
+
+/**
+ * A utility class to help configuring objects.
+ *
+ * @author Meikel Brandmeyer
+ */
+class ConfigureUtil {
+    /**
+     * Configures the <code>target</code> object. It sets it as the delegate
+     * of the <code>configureFn</code> closure and calls the latter. Passes
+     * the target object also as first argument to the closure should it
+     * support it.
+     *
+     * @param  target      the object to configure
+     * @param  configureFn a closure to be executed with <code>target</code> as delegate
+     * @return             <code>target</code>
+     */
+    static configure(Object target, Closure configureFn={}) {
+        def fn = configureFn.clone()
+
+        fn.resolveStrategy = Closure.DELEGATE_FIRST
+        fn.delegate        = target
+
+        if (fn.maximumNumberOfParameters == 0)
+            fn.call()
+        else
+            fn.call(target)
+
+        target
+    }
+}