From 29dd569942c37b8061379e3867f812275de21002 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Sun, 14 May 2023 20:56:28 -0400 Subject: [PATCH 1/7] Bump to next development cycle Signed-off-by: Jarek Sacha --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dd7d799..cdff448 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ scripting-scala - 0.3.1-SNAPSHOT + 0.3.2-SNAPSHOT SciJava Scripting: Scala JSR-223-compliant Scala scripting language plugin. From 653b60131c48ae18796d79bc63421c5a9c14513a Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Tue, 23 May 2023 17:27:53 -0400 Subject: [PATCH 2/7] Fixed: Test on Windows fail with: "InvalidPathException: Illegal char <:> at index 2: /C:/Users/..." #11 --- .../scripting/scala/ScalaAdaptedScriptEngineFactory.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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") From a5c714e94adcba657263b63bd9b3c86b997cf503 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Tue, 23 May 2023 17:29:27 -0400 Subject: [PATCH 3/7] Bump to Scala 3.3.0 LTS #12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cdff448..614a0ed 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ sign,deploy-to-scijava - 3.2.2 + 3.3.0 From 80e5a3216427cb4a3f2e61e05b60bd46e101f910 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Tue, 23 May 2023 17:30:47 -0400 Subject: [PATCH 4/7] Bump pom-scijava to 35.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 614a0ed..2311621 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 35.0.0 + 35.1.0 From 64681bf00789bf0950f760a694cec1b741fe32e3 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Tue, 23 May 2023 21:45:50 -0400 Subject: [PATCH 5/7] Bump to next development cycle Signed-off-by: Jarek Sacha --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2311621..ac96131 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ scripting-scala - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT SciJava Scripting: Scala JSR-223-compliant Scala scripting language plugin. From 8c733d7e09a9c419962d22b1e80b9d31c0c77251 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 1 Apr 2024 22:48:02 -0500 Subject: [PATCH 6/7] POM: tidy up configuration blocks And factor out version strings to properties. --- pom.xml | 66 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index ac96131..6d7955b 100644 --- a/pom.xml +++ b/pom.xml @@ -96,15 +96,39 @@ sign,deploy-to-scijava 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 - - + + + From 3e38b3323ed657054e617f94cf70c19bf288ee54 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 1 Apr 2024 22:48:22 -0500 Subject: [PATCH 7/7] Happy New Year 2024 --- LICENSE.txt | 2 +- src/main/java/org/scijava/plugins/scripting/scala/Main.java | 2 +- .../scijava/plugins/scripting/scala/ScalaScriptLanguage.java | 2 +- .../java/org/scijava/plugins/scripting/scala/ScalaTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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/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/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: