upgrade to scala 2.13.4 (#1092)

* WIP scala 2.13.4 port. current issue:

method with a single empty parameter list overrides method without any
parameter list

* .bsp to gitignore

* don't fail for deprecation warnings temporarily

* back to original version - getting deprecation warnings, but works

* fix repl predef initialization

* upgrade cask to resolve incompatible ujson version error

* cleanup, implement parameter parsing (not quite sure...)

* scalafmt

* fix parameter passing to scripts

* add test

Author: mpollmeier

.gitignore

@@ -19,6 +19,7 @@ project/.bloop
 /target
 /foo.c
 /woo.c
+/.bsp
 
 foo.c
 woo.c

build.sbt

@@ -6,10 +6,7 @@ val overflowdbVersion = "1.28"
 inThisBuild(
   List(
     organization := "io.shiftleft",
-    /* n.b. skip 2.13.1, it has a regression https://github.com/scala/bug/issues/11754,
-     * which is fixed in https://github.com/scala/scala/pull/8447, i.e. we can upgrade
-     * to 2.13.2 once that's released */
-    scalaVersion := "2.13.0",
+    scalaVersion := "2.13.4",
     resolvers ++= Seq(
       Resolver.mavenLocal,
       Resolver.bintrayRepo("shiftleft", "maven"),
@@ -74,7 +71,7 @@ lazy val fuzzyc2cpgtests = Projects.fuzzyc2cpgtests
 ThisBuild/scalacOptions ++= Seq(
   "-deprecation",
   "-feature",
-  "-Xfatal-warnings",
+  // "-Xfatal-warnings", // TODO MP reenable
   "-language:implicitConversions",
   "-Ycache-macro-class-loader:last-modified",
   "-Ybackend-parallelism", "4")

console/build.sbt

@@ -16,15 +16,14 @@ scalacOptions ++= Seq(
   "-language:implicitConversions",     // Allow definition of implicit functions called views
   "-unchecked",                        // Enable additional warnings where generated code depends on assumptions.
   "-Xcheckinit",                       // Wrap field accessors to throw an exception on uninitialized access.
-  "-Xfatal-warnings",                  // Fail the compilation if there are any warnings.
+  // "-Xfatal-warnings",   // TODO MP reenable               // Fail the compilation if there are any warnings.
   "-Xlint:adapted-args",               // Warn if an argument list is modified to match the receiver.
   "-Xlint:constant",                   // Evaluation of a constant arithmetic expression results in an error.
   "-Xlint:delayedinit-select",         // Selecting member of DelayedInit.
   "-Xlint:doc-detached",               // A Scaladoc comment appears to be detached from its element.
   "-Xlint:inaccessible",               // Warn about inaccessible types in method signatures.
   "-Xlint:infer-any",                  // Warn when a type argument is inferred to be `Any`.
   "-Xlint:missing-interpolator",       // A string literal appears to be missing an interpolator id.
-  "-Xlint:nullary-unit",               // Warn when nullary methods return Unit.
   "-Xlint:option-implicit",            // Option.apply used implicit view.
   "-Xlint:package-object-classes",     // Class or object defined in package object.
   "-Xlint:poly-implicit-overload",     // Parameterized overloaded implicit methods are not visible as view bounds.
@@ -44,10 +43,10 @@ scalacOptions ++= Seq(
 
 val ScoptVersion = "3.7.1"
 val BetterFilesVersion = "3.8.0"
-val CaskVersion = "0.6.7"
+val CaskVersion = "0.7.8"
 val CatsVersion = "2.0.0"
 val CirceVersion = "0.12.2"
-val AmmoniteVersion = "2.0.4"
+val AmmoniteVersion = "2.3.8-4-88785969"
 val ZeroturnaroundVersion = "1.13"
 
 dependsOn(Projects.fuzzyc2cpg % Test)

console/src/main/scala/io/shiftleft/console/BridgeBase.scala

@@ -261,12 +261,10 @@ trait BridgeBase {
   private def runScript(scriptFile: Path, config: Config) = {
     val isEncryptedScript = scriptFile.ext == "enc"
     System.err.println(s"executing $scriptFile with params=${config.params}")
-    val scriptArgs: Seq[(String, Option[String])] = {
-      val commandArgs = config.command match {
-        case Some(command) => Seq(command -> None)
-        case _             => Nil
-      }
-      commandArgs ++ config.params.view.mapValues(Option.apply).toSeq
+    val scriptArgs: Seq[String] = {
+      val commandArgs = config.command.toList
+      val parameterArgs = config.params.flatMap { case (key, value) => Seq(s"--$key", value) }
+      commandArgs ++ parameterArgs
     }
     val actualScriptFile =
       if (isEncryptedScript) decryptedScript(scriptFile)

console/src/main/scala/io/shiftleft/console/Run.scala

@@ -22,7 +22,7 @@ object Run {
             override val name = "custom"
             override def run(): Iterator[DiffGraph] = {
               implicit val diffGraph: DiffGraph.Builder = DiffGraph.newBuilder
-              query.store
+              query.store()
               Iterator(diffGraph.build())
             }
           }

console/src/main/scala/io/shiftleft/console/cpgcreation/CpgGenerator.scala

@@ -31,7 +31,7 @@ abstract class CpgGenerator() {
       return None
     }
     val cmd = Seq[String](program) ++ arguments
-    val exitValue = cmd.run.exitValue()
+    val exitValue = cmd.run().exitValue()
     if (exitValue == 0) {
       Some(cmd.toString)
     } else {

console/src/main/scala/io/shiftleft/console/scan/ScanPass.scala

@@ -13,6 +13,6 @@ class ScanPass(cpg: Cpg, queries: List[Query])
   override def runOnPart(query: Query): Iterator[DiffGraph] = {
     val diffGraph = DiffGraph.newBuilder
     query(cpg).foreach(diffGraph.addNode)
-    Iterator(diffGraph.build)
+    Iterator(diffGraph.build())
   }
 }

console/src/main/scala/io/shiftleft/console/scripting/AmmoniteExecutor.scala

@@ -35,14 +35,13 @@ trait AmmoniteExecutor {
     * @return The result of running the script.
     */
   def runScript(scriptPath: Path, parameters: Map[String, String], bindings: IndexedSeq[Bind[_]]): IO[Any] = {
+    val args: Seq[String] = parameters.flatMap { case (key, value) => Seq(s"--$key", value) }.toSeq
     for {
       replInstance <- IO(ammoniteMain.instantiateRepl(bindings))
       repl <- IO.fromEither(replInstance.left.map { case (err, _) => new RuntimeException(err.msg) })
       ammoniteResult <- IO {
-        repl.interp.initializePredef()
-        ammonite.main.Scripts.runScript(ammoniteMain.wd, os.Path(scriptPath), repl.interp, parameters.map {
-          case (k, v) => k -> Some(v)
-        }.toSeq)
+        repl.initializePredef()
+        ammonite.main.Scripts.runScript(ammoniteMain.wd, os.Path(scriptPath), repl.interp, args)
       }
       result <- ammoniteResult match {
         case Res.Success(res)     => IO.pure(res)

console/src/test/resources/scripts/general/arguments-concatenate.sc

@@ -0,0 +1,3 @@
+@main def main(one: String, two: String) = {
+  s"$one $two"
+}

console/src/test/scala/io/shiftleft/console/QueryDatabaseTests.scala

@@ -10,7 +10,8 @@ object TestBundle extends QueryBundle {
     author = "an-author",
     title = "a-title",
     description = s"a-description $n",
-    score = 2.0, traversal = { cpg =>
+    score = 2.0,
+    traversal = { cpg =>
       cpg.method
     }
   )