Skip to content

Commit

Permalink
Bring back jvmoptions
Browse files Browse the repository at this point in the history
  • Loading branch information
rpalcolea committed Nov 28, 2023
1 parent d41c195 commit 823a587
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ dependencies {
implementation 'org.clojure:clojure:1.10.3'
implementation 'org.clojure:tools.namespace:1.1.0'
implementation 'us.bpsm:edn-java:0.4.3'

implementation ('de.kotka.gradle:gradle-utils:0.2.2') {
exclude group: 'org.codehaus.groovy'
}
testImplementation gradleTestKit()
testImplementation 'com.netflix.nebula:nebula-publishing-plugin:5.+'
}
Expand Down
2 changes: 2 additions & 0 deletions gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ com.perforce:p4java:2015.2.1365273=integTestCompileClasspath,integTestRuntimeCla
com.trilead:trilead-ssh2:1.0.0-build220=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.6=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
commons-logging:commons-logging:1.1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
de.kotka.gradle:gradle-utils:0.2.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
de.kotka.groovy:zweig:0.4.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
de.regnis.q.sequence:sequence-library:1.0.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
net.java.dev.jna:jna-platform:4.1.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package nebula.plugin.clojuresque.tasks

import kotka.gradle.utils.ConfigureUtil
import nebula.plugin.clojuresque.Util
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.model.ObjectFactory
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

package nebula.plugin.clojuresque.tasks

import kotka.gradle.utils.ConfigureUtil
import nebula.plugin.clojuresque.Util
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.model.ObjectFactory
Expand Down Expand Up @@ -53,6 +54,8 @@ abstract class ClojureTest extends ClojureSourceTask {

private final ObjectFactory objects

@Internal
def jvmOptions = {}

@Inject
ClojureTest(ExecOperations execOperations, ObjectFactory objects) {
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 823a587

Please sign in to comment.