File tree Expand file tree Collapse file tree 13 files changed +6
-54
lines changed Expand file tree Collapse file tree 13 files changed +6
-54
lines changed Original file line number Diff line number Diff line change 1
1
name := " benchmarks"
2
2
3
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
4
-
5
3
dependsOn(Projects .dataflowengineoss)
6
4
dependsOn(Projects .semanticcpg)
7
5
dependsOn(Projects .console)
@@ -16,12 +14,8 @@ Compile / doc / sources ~= (_ filter (_ => false))
16
14
17
15
// we want to consume this from a java8 build
18
16
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"
25
19
26
20
trapExit := false
27
21
Test / fork := true
Original file line number Diff line number Diff line change 1
1
name := " joern"
2
2
ThisBuild / organization := " io.joern"
3
- ThisBuild / scalaVersion := " 2.13.8 "
3
+ ThisBuild / scalaVersion := " 3.1.3 "
4
4
5
5
val cpgVersion = " 1.3.577"
6
6
Original file line number Diff line number Diff line change @@ -2,8 +2,6 @@ name := "console"
2
2
3
3
enablePlugins(JavaAppPackaging )
4
4
5
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
6
-
7
5
val ScoptVersion = " 4.0.1"
8
6
val CaskVersion = " 0.8.3"
9
7
val CirceVersion = " 0.14.2"
@@ -25,7 +23,8 @@ libraryDependencies ++= Seq(
25
23
" io.circe" %% " circe-generic" % CirceVersion ,
26
24
" io.circe" %% " circe-parser" % CirceVersion ,
27
25
" 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 ,
29
28
" com.lihaoyi" %% " os-lib" % " 0.8.1" ,
30
29
" com.lihaoyi" %% " cask" % CaskVersion ,
31
30
" org.scalatest" %% " scalatest" % Versions .scalatest % Test
Original file line number Diff line number Diff line change 1
1
name := " dataflowengineoss"
2
2
3
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
4
-
5
3
dependsOn(Projects .semanticcpg, Projects .x2cpg)
6
4
7
5
libraryDependencies ++= Seq (
@@ -18,9 +16,4 @@ Compile / doc / sources ~= (_ filter (_ => false))
18
16
19
17
// we want to consume this from a java8 build
20
18
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"
Original file line number Diff line number Diff line change 1
1
name := " c2cpg"
2
- scalaVersion := " 2.13.8"
3
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
4
2
5
3
dependsOn(Projects .semanticcpg, Projects .dataflowengineoss % Test , Projects .x2cpg % " compile->compile;test->test" )
6
4
Original file line number Diff line number Diff line change 1
1
name := " javasrc2cpg"
2
2
3
- scalaVersion := " 2.13.8"
4
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
5
-
6
3
dependsOn(Projects .dataflowengineoss, Projects .x2cpg % " compile->compile;test->test" )
7
4
8
5
libraryDependencies ++= Seq (
Original file line number Diff line number Diff line change 1
1
name := " jimple2cpg"
2
2
3
- scalaVersion := " 2.13.8"
4
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
5
-
6
3
dependsOn(Projects .dataflowengineoss, Projects .x2cpg % " compile->compile;test->test" )
7
4
8
5
libraryDependencies ++= Seq (
Original file line number Diff line number Diff line change 1
1
name := " jssrc2cpg"
2
- scalaVersion := " 2.13.8"
3
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
4
2
5
3
dependsOn(Projects .dataflowengineoss, Projects .x2cpg % " compile->compile;test->test" )
6
4
Original file line number Diff line number Diff line change @@ -3,9 +3,6 @@ import scala.util.Properties.isWin
3
3
4
4
name := " php2cpg"
5
5
6
- scalaVersion := " 2.13.8"
7
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
8
-
9
6
dependsOn(Projects .dataflowengineoss, Projects .x2cpg % " compile->compile;test->test" )
10
7
11
8
libraryDependencies ++= Seq (
Original file line number Diff line number Diff line change 1
1
name := " pysrc2cpg"
2
2
3
- scalaVersion := " 2.13.8"
4
-
5
3
dependsOn(Projects .dataflowengineoss, Projects .x2cpg % " compile->compile;test->test" )
6
4
7
5
libraryDependencies ++= Seq (
Original file line number Diff line number Diff line change 1
1
name := " x2cpg"
2
- scalaVersion := " 2.13.8"
3
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
4
2
5
3
dependsOn(Projects .semanticcpg)
6
4
Original file line number Diff line number Diff line change 1
1
name := " macros"
2
2
3
- scalaVersion := " 2.13.8"
4
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
5
-
6
3
dependsOn(Projects .semanticcpg % Test )
7
4
8
5
libraryDependencies ++= Seq (
9
6
" io.shiftleft" %% " codepropertygraph" % Versions .cpg,
10
7
" 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
- }
23
8
)
24
9
25
10
enablePlugins(JavaAppPackaging )
Original file line number Diff line number Diff line change 1
1
name := " semanticcpg"
2
2
3
- crossScalaVersions := Seq (" 2.13.8" , " 3.1.3" )
4
-
5
3
libraryDependencies ++= Seq (
6
4
" io.shiftleft" %% " codepropertygraph" % Versions .cpg,
7
5
" org.json4s" %% " json4s-native" % Versions .json4s,
You can’t perform that action at this time.
0 commit comments