Update to latest 2.13, w/ more fixes

EHRI · Sep 27, 2023 · a5f61f9 · a5f61f9
1 parent 678ffde
commit a5f61f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -17,7 +17,7 @@ logBuffered := false
 logLevel := Level.Info
 ThisBuild / organization := "eu.ehri-project"
 
-val projectScalaVersion = "2.13.4"
+val projectScalaVersion = "2.13.11"
 val appName = "docview"
 
 val backendVersion = "0.15.1"
@@ -356,7 +356,7 @@ lazy val xquery = Project(appName + "-xquery", file("modules/xquery"))
     "org.basex" % "basex" % "8.5",
 
     // Command line parsing
-    "com.github.scopt" %% "scopt" % "4.0.1",
+    "com.github.scopt" %% "scopt" % "4.1.0",
 
     specs2 % Test,
   ))

diff --git a/modules/xquery/src/main/scala/eu/ehri/project/xml/XQueryTransformer.scala b/modules/xquery/src/main/scala/eu/ehri/project/xml/XQueryTransformer.scala
@@ -6,7 +6,7 @@ import org.slf4j.{Logger, LoggerFactory}
 import scopt.OParser
 
 import java.io.{File, FileNotFoundException}
-import scala.io.Source
+import scala.io.{BufferedSource, Source}
 
 /**
   * Command-line interface to the BaseXXQueryTransformer
@@ -56,7 +56,7 @@ object XQueryTransformer {
           .text("Additional namespaces in prefix1=url1,prefix2=url2 format."),
         opt[Unit]("print-script")
           .action((_, opt) => {
-            println(using(Source.fromResource("transform.xqy"))(_.mkString))
+            println(using[BufferedSource, String](Source.fromResource("transform.xqy"))(_.mkString))
             System.exit(1)
             opt
           })
@@ -66,7 +66,7 @@ object XQueryTransformer {
               |use with the -s|script <script-file.xqy> option.""".stripMargin),
         opt[Unit]("print-functions")
           .action((_, opt) => {
-            println(using(Source.fromResource("xtra.xqm"))(_.mkString))
+            println(using[BufferedSource, String](Source.fromResource("xtra.xqm"))(_.mkString))
             System.exit(1)
             opt
           })