diff --git a/LICENSE.txt b/LICENSE.txt index 08db1a8..8082288 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2013 - 2023, SciJava developers. +Copyright (c) 2013 - 2024, SciJava developers. All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/pom.xml b/pom.xml index dd7d799..6d7955b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.scijava pom-scijava - 35.0.0 + 35.1.0 scripting-scala - 0.3.1-SNAPSHOT + 0.3.3-SNAPSHOT SciJava Scripting: Scala JSR-223-compliant Scala scripting language plugin. @@ -95,16 +95,40 @@ sign,deploy-to-scijava - 3.2.2 + 3.3.0 + 4.8.1 + + + + org.scijava + scijava-common + + + + + org.scala-lang + scala3-compiler_3 + ${scala.version} + + + - - - - net.alchim31.maven - scala-maven-plugin - 4.8.1 + + + junit + junit + test + + + + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin.version} -unchecked @@ -132,31 +156,7 @@ - - - - - - - - org.scijava - scijava-common - - - - - org.scala-lang - scala3-compiler_3 - ${scala.version} - - - - - - - junit - junit - test - - + + + diff --git a/src/main/java/org/scijava/plugins/scripting/scala/Main.java b/src/main/java/org/scijava/plugins/scripting/scala/Main.java index 2d729cc..e272aa8 100644 --- a/src/main/java/org/scijava/plugins/scripting/scala/Main.java +++ b/src/main/java/org/scijava/plugins/scripting/scala/Main.java @@ -2,7 +2,7 @@ * #%L * JSR-223-compliant Scala scripting language plugin. * %% - * Copyright (C) 2013 - 2023 SciJava developers. + * Copyright (C) 2013 - 2024 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plugins/scripting/scala/ScalaScriptLanguage.java b/src/main/java/org/scijava/plugins/scripting/scala/ScalaScriptLanguage.java index 65deb83..1d863e8 100644 --- a/src/main/java/org/scijava/plugins/scripting/scala/ScalaScriptLanguage.java +++ b/src/main/java/org/scijava/plugins/scripting/scala/ScalaScriptLanguage.java @@ -2,7 +2,7 @@ * #%L * JSR-223-compliant Scala scripting language plugin. * %% - * Copyright (C) 2013 - 2023 SciJava developers. + * Copyright (C) 2013 - 2024 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/scala/org/scijava/plugins/scripting/scala/ScalaAdaptedScriptEngineFactory.scala b/src/main/scala/org/scijava/plugins/scripting/scala/ScalaAdaptedScriptEngineFactory.scala index a0aaf52..967baf9 100644 --- a/src/main/scala/org/scijava/plugins/scripting/scala/ScalaAdaptedScriptEngineFactory.scala +++ b/src/main/scala/org/scijava/plugins/scripting/scala/ScalaAdaptedScriptEngineFactory.scala @@ -32,6 +32,7 @@ package org.scijava.plugins.scripting.scala import org.scijava.plugins.scripting.scala.ScalaAdaptedScriptEngine import java.net.URLClassLoader +import java.nio.file.Paths import java.util import javax.script.{ScriptEngine, ScriptEngineFactory} @@ -71,6 +72,8 @@ class ScalaAdaptedScriptEngineFactory extends ScriptEngineFactory: */ def classPath: String = ClassLoader.getSystemClassLoader match case cl: URLClassLoader => - cl.getURLs.map(_.getPath).mkString(System.getProperty("path.separator")) + cl.getURLs + .map(url => Paths.get(url.toURI).toString) + .mkString(System.getProperty("path.separator")) case _ => System.getProperty("java.class.path") diff --git a/src/test/java/org/scijava/plugins/scripting/scala/ScalaTest.java b/src/test/java/org/scijava/plugins/scripting/scala/ScalaTest.java index 1d4e14a..504bfa2 100644 --- a/src/test/java/org/scijava/plugins/scripting/scala/ScalaTest.java +++ b/src/test/java/org/scijava/plugins/scripting/scala/ScalaTest.java @@ -2,7 +2,7 @@ * #%L * JSR-223-compliant Scala scripting language plugin. * %% - * Copyright (C) 2013 - 2023 SciJava developers. + * Copyright (C) 2013 - 2024 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: