Skip to content

Commit 4d8d6de

Browse files
committed
drop scala2 for now, use workaround for ammonite dependency mixup
re com-lihaoyi/Ammonite#1241
1 parent 82c366b commit 4d8d6de

File tree

13 files changed

+6
-54
lines changed

13 files changed

+6
-54
lines changed

benchmarks/build.sbt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name := "benchmarks"
22

3-
crossScalaVersions := Seq("2.13.8", "3.1.3")
4-
53
dependsOn(Projects.dataflowengineoss)
64
dependsOn(Projects.semanticcpg)
75
dependsOn(Projects.console)
@@ -16,12 +14,8 @@ Compile / doc / sources ~= (_ filter (_ => false))
1614

1715
// we want to consume this from a java8 build
1816
compile / javacOptions ++= Seq("--release", "8")
19-
scalacOptions ++= Seq() ++ (
20-
CrossVersion.partialVersion(scalaVersion.value) match {
21-
case Some((3, _)) => Seq("-Xtarget:8")
22-
case _ => Seq("-target:jvm-1.8")
23-
}
24-
)
17+
18+
scalacOptions += "-Xtarget:8"
2519

2620
trapExit := false
2721
Test / fork := true

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "joern"
22
ThisBuild / organization := "io.joern"
3-
ThisBuild / scalaVersion := "2.13.8"
3+
ThisBuild / scalaVersion := "3.1.3"
44

55
val cpgVersion = "1.3.577"
66

console/build.sbt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name := "console"
22

33
enablePlugins(JavaAppPackaging)
44

5-
crossScalaVersions := Seq("2.13.8", "3.1.3")
6-
75
val ScoptVersion = "4.0.1"
86
val CaskVersion = "0.8.3"
97
val CirceVersion = "0.14.2"
@@ -25,7 +23,8 @@ libraryDependencies ++= Seq(
2523
"io.circe" %% "circe-generic" % CirceVersion,
2624
"io.circe" %% "circe-parser" % CirceVersion,
2725
"org.zeroturnaround" % "zt-zip" % ZeroturnaroundVersion,
28-
"com.lihaoyi" %% "ammonite" % AmmoniteVersion cross CrossVersion.full,
26+
// "com.lihaoyi" %% "ammonite" % AmmoniteVersion cross CrossVersion.full,
27+
"com.lihaoyi" % "ammonite_3.1.3" % AmmoniteVersion,
2928
"com.lihaoyi" %% "os-lib" % "0.8.1",
3029
"com.lihaoyi" %% "cask" % CaskVersion,
3130
"org.scalatest" %% "scalatest" % Versions.scalatest % Test

dataflowengineoss/build.sbt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name := "dataflowengineoss"
22

3-
crossScalaVersions := Seq("2.13.8", "3.1.3")
4-
53
dependsOn(Projects.semanticcpg, Projects.x2cpg)
64

75
libraryDependencies ++= Seq(
@@ -18,9 +16,4 @@ Compile / doc / sources ~= (_ filter (_ => false))
1816

1917
// we want to consume this from a java8 build
2018
compile / javacOptions ++= Seq("--release", "8")
21-
scalacOptions ++= Seq() ++ (
22-
CrossVersion.partialVersion(scalaVersion.value) match {
23-
case Some((3, _)) => Seq("-Xtarget:8")
24-
case _ => Seq("-target:jvm-1.8")
25-
}
26-
)
19+
scalacOptions += "-Xtarget:8"

joern-cli/frontends/c2cpg/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
name := "c2cpg"
2-
scalaVersion := "2.13.8"
3-
crossScalaVersions := Seq("2.13.8", "3.1.3")
42

53
dependsOn(Projects.semanticcpg, Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test")
64

joern-cli/frontends/javasrc2cpg/build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name := "javasrc2cpg"
22

3-
scalaVersion := "2.13.8"
4-
crossScalaVersions := Seq("2.13.8", "3.1.3")
5-
63
dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
74

85
libraryDependencies ++= Seq(

joern-cli/frontends/jimple2cpg/build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name := "jimple2cpg"
22

3-
scalaVersion := "2.13.8"
4-
crossScalaVersions := Seq("2.13.8", "3.1.3")
5-
63
dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
74

85
libraryDependencies ++= Seq(

joern-cli/frontends/jssrc2cpg/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
name := "jssrc2cpg"
2-
scalaVersion := "2.13.8"
3-
crossScalaVersions := Seq("2.13.8", "3.1.3")
42

53
dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
64

joern-cli/frontends/php2cpg/build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import scala.util.Properties.isWin
33

44
name := "php2cpg"
55

6-
scalaVersion := "2.13.8"
7-
crossScalaVersions := Seq("2.13.8", "3.1.3")
8-
96
dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
107

118
libraryDependencies ++= Seq(

joern-cli/frontends/pysrc2cpg/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name := "pysrc2cpg"
22

3-
scalaVersion := "2.13.8"
4-
53
dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
64

75
libraryDependencies ++= Seq(

joern-cli/frontends/x2cpg/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
name := "x2cpg"
2-
scalaVersion := "2.13.8"
3-
crossScalaVersions := Seq("2.13.8", "3.1.3")
42

53
dependsOn(Projects.semanticcpg)
64

macros/build.sbt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
11
name := "macros"
22

3-
scalaVersion := "2.13.8"
4-
crossScalaVersions := Seq("2.13.8", "3.1.3")
5-
63
dependsOn(Projects.semanticcpg % Test)
74

85
libraryDependencies ++= Seq(
96
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
107
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
11-
) ++ (
12-
CrossVersion.partialVersion(scalaVersion.value) match {
13-
case Some((3, _)) => Seq()
14-
case _ => Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
15-
}
16-
)
17-
18-
scalacOptions ++= Seq() ++ (
19-
CrossVersion.partialVersion(scalaVersion.value) match {
20-
case Some((3, _)) => Seq()
21-
case _ => Seq("-Yrangepos")
22-
}
238
)
249

2510
enablePlugins(JavaAppPackaging)

semanticcpg/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name := "semanticcpg"
22

3-
crossScalaVersions := Seq("2.13.8", "3.1.3")
4-
53
libraryDependencies ++= Seq(
64
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
75
"org.json4s" %% "json4s-native" % Versions.json4s,

0 commit comments

Comments
 (0)