Merge pull request #230 from Mingun/upgrade-dependencies

Upgrade all dependencies to the latest versions

build.sbt

@@ -19,7 +19,8 @@ lazy val root = project.in(file(".")).
     publishLocal := {}
   )
 
-lazy val compiler = crossProject.in(file(".")).
+lazy val compiler = crossProject(JSPlatform, JVMPlatform).
+  in(file(".")).
   enablePlugins(JavaAppPackaging).
   settings(
     organization := "io.kaitai",
@@ -70,17 +71,19 @@ lazy val compiler = crossProject.in(file(".")).
     Compile / sourceGenerators += generateVersionTask.taskValue, // update automatically on every rebuild
 
     libraryDependencies ++= Seq(
-      "com.github.scopt" %%% "scopt" % "3.6.0",
-      "com.lihaoyi" %%% "fastparse" % "1.0.0",
-      "org.yaml" % "snakeyaml" % "1.28"
+      "com.github.scopt" %%% "scopt" % "4.1.0",
+      "com.lihaoyi" %%% "fastparse" % "2.3.3",
+      "org.yaml" % "snakeyaml" % "2.0"
     )
   ).
   jvmSettings(
     name := NAME,
 
     Compile / mainClass := Some("io.kaitai.struct.JavaMain"),
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % "3.2.12" % "test"
+      "org.scalatest" %% "scalatest-funspec" % "3.2.15" % "test",
+      "org.scalatest" %% "scalatest-funsuite" % "3.2.15" % "test",
+      "org.scalatest" %% "scalatest-shouldmatchers" % "3.2.15" % "test",
     ),
 
     Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-u", "target/test_out"),
@@ -228,13 +231,8 @@ lazy val buildNpmJsFileTask = Def.task {
        |  }
        |}(typeof self !== 'undefined' ? self : this, function () {
        |
-       |var exports = {};
-       |var __ScalaJSEnv = { exportsNamespace: exports };
-       |
        |$compiledFileContents
-       |
-       |return exports.MainJs;
-       |
+       |return MainJs;
        |}));
        |""".stripMargin
 

js/src/main/scala/io/kaitai/struct/format/JavaScriptKSYParser.scala

@@ -18,7 +18,7 @@ object JavaScriptKSYParser {
     val yamlScala = yamlJavascriptToScala(yaml)
     val firstSpec = ClassSpec.fromYaml(yamlScala, None)
     val specs = new JavaScriptClassSpecs(importer, firstSpec)
-    Main.importAndPrecompile(specs, config).map{ problems =>
+    Main.importAndPrecompile(specs, config).map { problems =>
       // throw the first (if any) severe (not a warning) problem as an exception
       problems.find(p => p.severity != ProblemSeverity.Warning) match {
         case Some(problem) => throw problem.toException

jvm/src/main/scala/io/kaitai/struct/JavaMain.scala

@@ -31,7 +31,7 @@ object JavaMain {
 
   def parseCommandLine(args: Array[String]): Option[CLIConfig] = {
     val parser = new scopt.OptionParser[CLIConfig](Version.name) {
-      override def showUsageOnError = true
+      override def showUsageOnError = Some(true)
 
       head(Version.name, Version.version)
 

jvm/src/main/scala/io/kaitai/struct/formats/JavaKSYParser.scala

@@ -7,10 +7,8 @@ import io.kaitai.struct.JavaMain.CLIConfig
 import io.kaitai.struct.format.{ClassSpec, ClassSpecs}
 import io.kaitai.struct.problems.{CompilationProblem, CompilationProblemException, ProblemCoords, ProblemSeverity, YAMLParserError}
 import io.kaitai.struct.{Log, Main}
-import org.yaml.snakeyaml.constructor.SafeConstructor
 import org.yaml.snakeyaml.error.MarkedYAMLException
-import org.yaml.snakeyaml.representer.Representer
-import org.yaml.snakeyaml.{DumperOptions, LoaderOptions, Yaml}
+import org.yaml.snakeyaml.{LoaderOptions, Yaml}
 
 import scala.collection.JavaConverters._
 import scala.concurrent.Await
@@ -71,12 +69,7 @@ object JavaKSYParser {
   def getYamlLoader: Yaml = {
     val loaderOptions = new LoaderOptions
     loaderOptions.setAllowDuplicateKeys(false)
-    new Yaml(
-      new SafeConstructor,
-      new Representer,
-      new DumperOptions,
-      loaderOptions
-    )
+    new Yaml(loaderOptions)
   }
 
   def readerToYaml(reader: Reader): Any = {

project/plugins.sbt

@@ -1,4 +1,5 @@
 logLevel := Level.Warn
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.12")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.33")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")