From cce0372cf8ae00c28a999528a1879e738c2cff30 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 15 Jul 2018 20:34:21 +0300 Subject: [PATCH] Grind fixes --- build.gradle | 3 ++- numass-main/src/main/groovy/inr/numass/LaunchGrindShell.groovy | 3 ++- numass-main/src/main/kotlin/inr/numass/NumassPlugin.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index adba4fec..d20c1656 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,7 @@ allprojects { compileKotlin { kotlinOptions { + freeCompilerArgs = ['-Xjvm-default=enable'] jvmTarget = "1.8" javaParameters = true } @@ -48,7 +49,7 @@ allprojects { compileTestKotlin { kotlinOptions { - freeCompilerArgs = ['-Xenable-jvm-default'] + freeCompilerArgs = ['-Xjvm-default=enable'] jvmTarget = "1.8" javaParameters = true } diff --git a/numass-main/src/main/groovy/inr/numass/LaunchGrindShell.groovy b/numass-main/src/main/groovy/inr/numass/LaunchGrindShell.groovy index a892385a..cb8c597f 100644 --- a/numass-main/src/main/groovy/inr/numass/LaunchGrindShell.groovy +++ b/numass-main/src/main/groovy/inr/numass/LaunchGrindShell.groovy @@ -2,6 +2,7 @@ package inr.numass import hep.dataforge.context.Global import hep.dataforge.grind.terminal.GrindTerminal +import hep.dataforge.grind.workspace.GrindWorkspace import hep.dataforge.workspace.FileBasedWorkspace import hep.dataforge.workspace.Workspace @@ -23,7 +24,7 @@ try { GrindTerminal.system().launch { if (cfgPath) { Workspace numass = FileBasedWorkspace.build(context, new File(cfgPath as String).toPath()) - bind("numass", numass) + bind("numass", new GrindWorkspace(numass)) } else { println "No configuration path. Provide path via --config option" } diff --git a/numass-main/src/main/kotlin/inr/numass/NumassPlugin.kt b/numass-main/src/main/kotlin/inr/numass/NumassPlugin.kt index 2115b61a..9ded4f2b 100644 --- a/numass-main/src/main/kotlin/inr/numass/NumassPlugin.kt +++ b/numass-main/src/main/kotlin/inr/numass/NumassPlugin.kt @@ -43,7 +43,7 @@ import org.apache.commons.math3.util.FastMath @PluginDef( group = "inr.numass", name = "numass", - dependsOn = arrayOf("hep.dataforge:functions", "hep.dataforge:MINUIT", "hep.dataforge:actions"), + dependsOn = ["hep.dataforge:functions", "hep.dataforge:MINUIT", "hep.dataforge:actions"], support = false, info = "Numass data analysis tools" )