diff --git a/.scalafmt.conf b/.scalafmt.conf index 09306d4..ae6bdd9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.0 +version = 3.8.3 runner.dialect = scala213source3 fileOverride { diff --git a/ReadMe.md b/ReadMe.md index e4b689e..5a27bf4 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -14,6 +14,21 @@ Core functionality * Utilities for loading and displaying images using JavaCV * Helper for converting between OpenCV and Scala/Java constructs * API for conversion between ImageJ and OpenCV types +* Color Chart Detector + +ImageJ Plugins +-------------- +Some of the functionality of [OpenCV]/[JavaCV] is exposed through ImageJ plugins + +* ColorChecker Detector +* Hough Circles +* Interactive segmentation using GrabCut algorithm + +More information about plugins is in the [Wiki] + +### ImageJ Plugins Installation + +Plugin binaries are provided on the [Releases] page ImageJ Scription ---------------- @@ -106,20 +121,6 @@ if (detector.process(mat, MCC24)) { println("ColorChecker not detected") ``` -ImageJ Plugins --------------- -Some of the functionality of [OpenCV]/[JavaCV] is exposed through ImageJ plugins - -* ColorChecker Detector -* Hough Circles -* Interactive segmentation using GrabCut algorithm - -More information about plugins is in the [Wiki] - -### Installation - -Plugin binaries are provided on the [Releases] page - [ImageJ]: http://imagej.net/index.html diff --git a/build.sbt b/build.sbt index f9b60f7..0e5e534 100644 --- a/build.sbt +++ b/build.sbt @@ -70,11 +70,11 @@ val commonSettings = Seq( "org.bytedeco" % "opencv" % "4.9.0-1.5.10" classifier platform, "org.bytedeco" % "openblas" % "0.3.26-1.5.10" withSources() withJavadoc(), "org.bytedeco" % "openblas" % "0.3.26-1.5.10" classifier platform, - "net.imagej" % "ij" % "1.54i", + "net.imagej" % "ij" % "1.54k", // "com.beachape" %% "enumeratum" % "1.5.13", // "mpicbg" % "mpicbg" % "1.1.1", // tests - "org.scalatest" %% "scalatest" % "3.2.18" % "test", + "org.scalatest" %% "scalatest" % "3.2.19" % "test", ), // @formatter:on Compile / doc / scalacOptions ++= Opts.doc.title("IJP JavaCV API"), @@ -134,7 +134,7 @@ lazy val ijp_javacv_plugins = commonSettings, name := "ijp-javacv-plugins", description := "IJP JavaCV ImageJ Plugins", - libraryDependencies ++= Seq("com.beachape" %% "enumeratum" % "1.7.3"), + libraryDependencies ++= Seq("com.beachape" %% "enumeratum" % "1.7.4"), scalacOptions ++= (if (isScala2(scalaVersion.value)) Seq.empty[String] diff --git a/experimental/build.sbt b/experimental/build.sbt index caa2795..31f63b6 100644 --- a/experimental/build.sbt +++ b/experimental/build.sbt @@ -10,11 +10,11 @@ libraryDependencies ++= Seq( // "org.scijava" % "scripting-javascript" % "1.0.0", // not needed for script editor - "org.python" % "jython-slim" % "2.7.3", + "org.python" % "jython-slim" % "2.7.4", // dependency overrides to pull bug fixes in transitive dependencies "org.scijava" % "scijava-optional" % "1.0.1", "org.scijava" % "scijava-table" % "1.0.2", - "org.scijava" % "scijava-ui-swing" % "1.0.1" + "org.scijava" % "scijava-ui-swing" % "1.0.2" // "org.codehaus.groovy" % "groovy" % "3.0.17" ) diff --git a/project/build.properties b/project/build.properties index d431d12..fb7dd1e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -19,5 +19,5 @@ # # Latest release available at http://sourceforge.net/projects/ij-plugins/ # -sbt.version=1.9.9 +sbt.version=1.10.2 diff --git a/project/sbt-sonatype.sbt b/project/sbt-sonatype.sbt index 856acd6..069cf28 100644 --- a/project/sbt-sonatype.sbt +++ b/project/sbt-sonatype.sbt @@ -2,5 +2,5 @@ // // [https://github.com/xerial/sbt-sonatype] // -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.3") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") \ No newline at end of file