Merge branch 'scala2.12-fixjavacp'

Closes #3.

Many thanks to Keith Schulze for his work on this!

Author: ctrueden

pom.xml

@@ -45,6 +45,10 @@
 			<roles><role>founder</role></roles>
 			<properties><id>dscho</id></properties>
 		</contributor>
+		<contributor>
+			<name>Keith Schulze</name>
+			<properties><id>keithschulze</id></properties>
+		</contributor>
 	</contributors>
 
 	<scm>
@@ -64,7 +68,7 @@
 
 	<properties>
 		<scijava.jvm.version>1.8</scijava.jvm.version>
-		<scala.version>2.12.0-M4</scala.version>
+		<scala.version>2.12.0</scala.version>
 	</properties>
 
 	<dependencies>

src/main/java/org/scijava/plugins/scripting/scala/ScalaScriptEngine.java

@@ -30,28 +30,60 @@
 
 package org.scijava.plugins.scripting.scala;
 
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 import javax.script.ScriptEngine;
 
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.AdaptedScriptLanguage;
 import org.scijava.script.ScriptLanguage;
 
+import scala.tools.nsc.ConsoleWriter;
+import scala.tools.nsc.NewLinePrintWriter;
+import scala.tools.nsc.Settings;
+import scala.tools.nsc.interpreter.Scripted;
+
 /**
  * An adapter of the Scala interpreter to the SciJava scripting interface.
  * 
  * @author Curtis Rueden
+ * @author Keith Schulze
  * @author Johannes Schindelin
  * @see ScriptEngine
  */
 @Plugin(type = ScriptLanguage.class, name = "Scala")
 public class ScalaScriptLanguage extends AdaptedScriptLanguage {
 
+	@Parameter
+	private LogService log;
+
 	public ScalaScriptLanguage() {
 		super("scala");
 	}
 
 	@Override
 	public ScriptEngine getScriptEngine() {
-		return new ScalaScriptEngine(super.getScriptEngine());
+		final Settings settings = new Settings();
+		settings.classpath().value_$eq(getClasspath());
+
+		return Scripted.apply(new Scripted.Factory(), settings,
+			new NewLinePrintWriter(new ConsoleWriter(), true));
+	}
+
+	/** Retrieves the current classpath as a string. */
+	private String getClasspath() {
+		final ClassLoader cl = ClassLoader.getSystemClassLoader();
+		if (!(cl instanceof URLClassLoader)) {
+			log.warn("Cannot retrieve classpath from class loader of type '" +
+				cl.getClass().getName() + "'");
+			return System.getProperty("java.class.path");
+		}
+		return Arrays.stream(((URLClassLoader) cl).getURLs()).map(//
+			url -> url.getPath() //
+		).collect(Collectors.joining(System.getProperty("path.separator")));
 	}
 }

src/main/java/org/scijava/plugins/scripting/scala/ScalaScriptLanguage.java

@@ -35,6 +35,7 @@
 import java.io.StringWriter;
 
 import javax.script.ScriptEngine;
+import javax.script.SimpleScriptContext;
 
 import org.junit.Test;
 import org.scijava.Context;
@@ -57,11 +58,12 @@ public void testBasic() throws Exception {
 			scriptService.getLanguageByExtension("scala");
 		final ScriptEngine engine = language.getScriptEngine();
 
+		final SimpleScriptContext ssc = new SimpleScriptContext();
 		final StringWriter writer = new StringWriter();
-		engine.put("writer", writer);
+		ssc.setWriter(writer);
 
-		final String script = "writer.write(\"3\");";
-		engine.eval(script);
+		final String script = "print(\"3\");";
+		engine.eval(script, ssc);
 		assertEquals("3", writer.toString());
 	}
 }