Build with JavaFX 19 to support use on Java 11 for Fiji

Versions of JVM newer than 11 do not support JavaScript used widely in Fiji.
ij-plugins · Sep 26, 2023 · cc3ea15 · cc3ea15
1 parent 0aa08e3
commit cc3ea15
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -15,23 +15,26 @@ lazy val root = (project in file("."))
       Seq(
         ijpColor,
         ijpColorUI,
-          //        ijpDebayer2sx,
+        //        ijpDebayer2sx,
         ijpDebayer2sxPlugins,
         ijpToolkit,
-          ijpScalaConsolePlugins,
+        //        ijpScalaConsolePlugins,
         ijpImageIO,
         imagej,
-          scalaTest % Test
+        scalaTest % Test
       ),
     //    // Add JavaFX dependencies used by IJP-Color
     //    libraryDependencies ++= javaFXModules.map(m =>
     //      "org.openjfx" % s"javafx-$m" % javaFXVersion classifier osName
     //    ),
-      fork := true,
-      ijRuntimeSubDir := "sandbox",
-      ijPluginsSubDir := "ij-plugins",
+    //
+    resolvers += Resolver.mavenLocal,
+    //
+    fork := true,
+    ijRuntimeSubDir := "sandbox",
+    ijPluginsSubDir := "ij-plugins",
     ijCleanBeforePrepareRun := true,
-      cleanFiles += ijPluginsDir.value
+    cleanFiles += ijPluginsDir.value
   )
 
 //name := "IJ-Plugins Bundle"

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,14 +2,14 @@ import sbt.*
 
 // @formatter:off
 object Dependencies {
-  lazy val ijpColor               = "net.sf.ij-plugins" %% "ijp-color"              % "0.12.2"
-  lazy val ijpColorUI             = "net.sf.ij-plugins" %% "ijp-color-ui"           % "0.12.2"
+  lazy val ijpColor               = "net.sf.ij-plugins" %% "ijp-color"              % "0.12.2-JVM11"
+  lazy val ijpColorUI             = "net.sf.ij-plugins" %% "ijp-color-ui"           % "0.12.2-JVM11"
   lazy val ijpDebayer2sx          = "net.sf.ij-plugins" %% "ijp-debayer2sx-core"    % "1.3.4"
   lazy val ijpDebayer2sxPlugins   = "net.sf.ij-plugins" %% "ijp-debayer2sx-plugins" % "1.3.4"
   lazy val ijpImageIO             = "net.sf.ij-plugins"  % "ijp_imageio"            % "2.3.0"
   lazy val ijpToolkit             = "net.sf.ij-plugins" %% "ijp-toolkit"            % "2.3.1"
-  lazy val ijpScalaConsole        = "net.sf.ij-plugins" %% "scala-console"          % "1.8.0"
-  lazy val ijpScalaConsolePlugins = "net.sf.ij-plugins" %% "scala-console-plugins"  % "1.8.0"
+//  lazy val ijpScalaConsole        = "net.sf.ij-plugins" %% "scala-console"          % "1.8.0-JVM11"
+//  lazy val ijpScalaConsolePlugins = "net.sf.ij-plugins" %% "scala-console-plugins"  % "1.8.0-JVM11"
   lazy val imagej                 = "net.imagej"         % "ij"                     % "1.54f"
   lazy val scalaTest              = "org.scalatest"     %% "scalatest"              % "3.2.17"
 }