drop scala2 for now, use workaround for ammonite dependency mixup

re com-lihaoyi/Ammonite#1241

Author: mpollmeier

benchmarks/build.sbt

@@ -1,7 +1,5 @@
 name := "benchmarks"
 
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 dependsOn(Projects.dataflowengineoss)
 dependsOn(Projects.semanticcpg)
 dependsOn(Projects.console)
@@ -18,12 +16,8 @@ Compile / doc / sources ~= (_ filter (_ => false))
 
 // we want to consume this from a java8 build
 compile / javacOptions ++= Seq("--release", "8")
-scalacOptions ++= Seq() ++ (
-  CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((3, _)) => Seq("-Xtarget:8")
-    case _            => Seq("-target:jvm-1.8")
-  }
-)
+
+scalacOptions += "-Xtarget:8"
 
 trapExit    := false
 Test / fork := true

build.sbt

@@ -1,6 +1,6 @@
 name                     := "joern"
 ThisBuild / organization := "io.joern"
-ThisBuild / scalaVersion := "2.13.8"
+ThisBuild / scalaVersion := "3.1.3"
 
 
 val cpgVersion = "1.3.568"
@@ -40,6 +40,14 @@ lazy val aggregatedProjects: Seq[ProjectReference] = Seq(
   kotlin2cpg
 )
 
+// ammonite-cross depends on both scala3 and scala 2.13 dependencies, leading to inconsistent classpaths...
+// https://github.com/com-lihaoyi/Ammonite/issues/1241
+ThisBuild / excludeDependencies ++= Seq(
+  "fansi", "os-lib", "upickle", "upickle-core", "upickle-implicits", "geny", "upack", "ujson", "sourcecode"
+).map(artifactName =>
+  ExclusionRule("com.lihaoyi", s"${artifactName}_2.13")
+) :+ ExclusionRule("org.scala-lang.modules", "scala-xml_2.13")
+
 ThisBuild / libraryDependencies += 
   "org.apache.logging.log4j" % "log4j-slf4j-impl" % Versions.log4j % Test
 

console/build.sbt

@@ -2,8 +2,6 @@ name := "console"
 
 enablePlugins(JavaAppPackaging)
 
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 val ScoptVersion          = "4.0.1"
 val CaskVersion           = "0.8.3"
 val CirceVersion          = "0.14.2"
@@ -19,7 +17,8 @@ libraryDependencies ++= Seq(
   "io.circe"             %% "circe-generic"     % CirceVersion,
   "io.circe"             %% "circe-parser"      % CirceVersion,
   "org.zeroturnaround"    % "zt-zip"            % ZeroturnaroundVersion,
-  "com.lihaoyi"          %% "ammonite"          % AmmoniteVersion cross CrossVersion.full,
+  // "com.lihaoyi"          %% "ammonite"          % AmmoniteVersion cross CrossVersion.full,
+  "com.lihaoyi"          %  "ammonite_3.1.3"    % AmmoniteVersion,
   "com.lihaoyi"          %% "os-lib"            % "0.8.1",
   "com.lihaoyi"          %% "cask"              % CaskVersion,
   "org.scalatest"        %% "scalatest"         % Versions.scalatest % Test

dataflowengineoss/build.sbt

@@ -1,7 +1,5 @@
 name := "dataflowengineoss"
 
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 dependsOn(Projects.semanticcpg, Projects.x2cpg)
 
 libraryDependencies ++= Seq(
@@ -18,9 +16,4 @@ Compile / doc / sources ~= (_ filter (_ => false))
 
 // we want to consume this from a java8 build
 compile / javacOptions ++= Seq("--release", "8")
-scalacOptions ++= Seq() ++ (
-  CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((3, _)) => Seq("-Xtarget:8")
-    case _            => Seq("-target:jvm-1.8")
-  }
-)
+scalacOptions += "-Xtarget:8"

joern-cli/frontends/c2cpg/build.sbt

@@ -1,6 +1,4 @@
 name               := "c2cpg"
-scalaVersion       := "2.13.8"
-crossScalaVersions := Seq("2.13.8", "3.1.3")
 
 dependsOn(Projects.semanticcpg, Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test")
 

joern-cli/frontends/javasrc2cpg/build.sbt

@@ -1,8 +1,5 @@
 name := "javasrc2cpg"
 
-scalaVersion       := "2.13.8"
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
 
 libraryDependencies ++= Seq(

joern-cli/frontends/jimple2cpg/build.sbt

@@ -1,8 +1,5 @@
 name := "jimple2cpg"
 
-scalaVersion       := "2.13.8"
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
 
 libraryDependencies ++= Seq(

joern-cli/frontends/jssrc2cpg/build.sbt

@@ -1,6 +1,4 @@
 name               := "jssrc2cpg"
-scalaVersion       := "2.13.8"
-crossScalaVersions := Seq("2.13.8", "3.1.3")
 
 dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
 

joern-cli/frontends/php2cpg/build.sbt

@@ -3,9 +3,6 @@ import scala.util.Properties.isWin
 
 name := "php2cpg"
 
-scalaVersion       := "2.13.8"
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
 
 libraryDependencies ++= Seq(

joern-cli/frontends/pysrc2cpg/build.sbt

@@ -1,7 +1,5 @@
 name := "pysrc2cpg"
 
-scalaVersion := "2.13.8"
-
 dependsOn(Projects.x2cpg % "compile->compile;test->test")
 
 libraryDependencies ++= Seq(

joern-cli/frontends/x2cpg/build.sbt

@@ -1,6 +1,4 @@
 name               := "x2cpg"
-scalaVersion       := "2.13.8"
-crossScalaVersions := Seq("2.13.8", "3.1.3")
 
 dependsOn(Projects.semanticcpg)
 

macros/build.sbt

@@ -1,25 +1,10 @@
 name := "macros"
 
-scalaVersion       := "2.13.8"
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 dependsOn(Projects.semanticcpg % Test)
 
 libraryDependencies ++= Seq(
   "io.shiftleft"  %% "codepropertygraph" % Versions.cpg,
   "org.scalatest" %% "scalatest"         % Versions.scalatest % Test
-) ++ (
-  CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((3, _)) => Seq()
-    case _            => Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
-  }
-)
-
-scalacOptions ++= Seq() ++ (
-  CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((3, _)) => Seq()
-    case _            => Seq("-Yrangepos")
-  }
 )
 
 enablePlugins(JavaAppPackaging)

semanticcpg/build.sbt

@@ -1,7 +1,5 @@
 name := "semanticcpg"
 
-crossScalaVersions := Seq("2.13.8", "3.1.3")
-
 libraryDependencies ++= Seq(
   "io.shiftleft"  %% "codepropertygraph" % Versions.cpg,
   "org.json4s"    %% "json4s-native"     % Versions.json4s,