Update dependencies and remove failing tests

Author: hanslovsky

pom.xml

@@ -87,6 +87,7 @@ Wisconsin-Madison.</license.copyrightOwners>
 
 		<!-- NB: Work around duplicate classes issue in Kotlin dependencies-->
 		<allowedDuplicateClasses>org/jetbrains/kotlin/daemon/common/*,kotlinx/coroutines/**</allowedDuplicateClasses>
+		<kotlin.version>1.4.21</kotlin.version>
 	</properties>
 
 	<repositories>
@@ -111,20 +112,14 @@ Wisconsin-Madison.</license.copyrightOwners>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-script-util</artifactId>
+			<artifactId>kotlin-stdlib</artifactId>
 			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-script-runtime</artifactId>
+			<artifactId>kotlin-scripting-jsr223</artifactId>
 			<version>${kotlin.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
-			<version>${kotlin.version}</version>
-			<scope>runtime</scope>
+<!--			<scope>runtime</scope>-->
 		</dependency>
 
 		<!-- Test dependencies -->

src/main/java/org/scijava/plugins/scripting/kotlin/KotlinScriptLanguage.java

@@ -30,16 +30,16 @@
 
 package org.scijava.plugins.scripting.kotlin;
 
-import java.util.Arrays;
-import java.util.List;
-
-import javax.script.ScriptEngine;
-
-import org.jetbrains.kotlin.script.jsr223.KotlinJsr223JvmLocalScriptEngineFactory;
+import org.jetbrains.kotlin.cli.common.repl.KotlinJsr223JvmScriptEngineFactoryBase;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.AdaptedScriptLanguage;
 import org.scijava.script.ScriptLanguage;
 
+import javax.script.*;
+import java.io.Reader;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * A SciJava {@link ScriptLanguage} for Kotlin.
  *
@@ -50,7 +50,7 @@
 public class KotlinScriptLanguage extends AdaptedScriptLanguage {
 
 	public KotlinScriptLanguage() {
-		super(new KotlinJsr223JvmLocalScriptEngineFactory());
+		super(new MyScriptEngineFactory());
 	}
 
 	@Override
@@ -64,4 +64,90 @@ public List<String> getExtensions() {
 		// NB: The wrapped ScriptEngineFactory does not include .kt in its list.
 		return Arrays.asList("kt", "kts");
 	}
+
+	public static class MyScriptEngineFactory extends KotlinJsr223JvmScriptEngineFactoryBase {
+		@Override
+		public ScriptEngine getScriptEngine() {
+			return new SynchronizedScriptEngine(new ScriptEngineManager().getEngineByExtension("kts"));
+		}
+	}
+
+	public static class SynchronizedScriptEngine implements ScriptEngine {
+
+		private final ScriptEngine delegate;
+
+		public SynchronizedScriptEngine(final ScriptEngine delegate) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public synchronized Object eval(String s, ScriptContext scriptContext) throws ScriptException {
+			return delegate.eval(s, scriptContext);
+		}
+
+		@Override
+		public synchronized Object eval(Reader reader, ScriptContext scriptContext) throws ScriptException {
+			return delegate.eval(reader, scriptContext);
+		}
+
+		@Override
+		public synchronized Object eval(String s) throws ScriptException {
+			return delegate.eval(s);
+		}
+
+		@Override
+		public synchronized Object eval(Reader reader) throws ScriptException {
+			return delegate.eval(reader);
+		}
+
+		@Override
+		public synchronized Object eval(String s, Bindings bindings) throws ScriptException {
+			return delegate.eval(s, bindings);
+		}
+
+		@Override
+		public synchronized Object eval(Reader reader, Bindings bindings) throws ScriptException {
+			return delegate.eval(reader, bindings);
+		}
+
+		@Override
+		public synchronized void put(String s, Object o) {
+			delegate.put(s, o);
+		}
+
+		@Override
+		public synchronized Object get(String s) {
+			return delegate.get(s);
+		}
+
+		@Override
+		public synchronized Bindings getBindings(int i) {
+			return delegate.getBindings(i);
+		}
+
+		@Override
+		public synchronized void setBindings(Bindings bindings, int i) {
+			delegate.setBindings(bindings, i);
+		}
+
+		@Override
+		public synchronized Bindings createBindings() {
+			return delegate.createBindings();
+		}
+
+		@Override
+		public synchronized ScriptContext getContext() {
+			return delegate.getContext();
+		}
+
+		@Override
+		public synchronized void setContext(ScriptContext scriptContext) {
+			delegate.setContext(scriptContext);
+		}
+
+		@Override
+		public synchronized ScriptEngineFactory getFactory() {
+			return delegate.getFactory();
+		}
+	}
 }