Skip to content

Commit

Permalink
Updated dependencies (#4418)
Browse files Browse the repository at this point in the history
Not going to Scala 3.4 (brings in some Syntax changes / many rewrites required with -rewrite source3.4migration)
  • Loading branch information
max-leuthaeuser authored Apr 3, 2024
1 parent 1a2b5c9 commit b4d0d8b
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.17
version = 3.8.1
runner.dialect = scala3
preset = IntelliJ
maxColumn = 120
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name := "joern"
ThisBuild / organization := "io.joern"
ThisBuild / scalaVersion := "3.3.1"
ThisBuild / scalaVersion := "3.3.3"

val cpgVersion = "1.6.9"
val cpgVersion = "1.6.10"

lazy val joerncli = Projects.joerncli
lazy val querydb = Projects.querydb
Expand Down
8 changes: 4 additions & 4 deletions console/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name := "console"
enablePlugins(JavaAppPackaging)

val ScoptVersion = "4.1.0"
val CaskVersion = "0.9.1"
val CaskVersion = "0.9.2"
val CirceVersion = "0.14.6"
val ZeroturnaroundVersion = "1.15"
val OsLibVersion = "0.9.1"
val PprintVersion = "0.7.3"
val ZeroturnaroundVersion = "1.17"
val OsLibVersion = "0.9.3"
val PprintVersion = "0.8.1"
val CommonsLangVersion = "3.14.0"

dependsOn(
Expand Down
4 changes: 2 additions & 2 deletions joern-cli/frontends/c2cpg/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependsOn(

libraryDependencies ++= Seq(
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4",
"org.eclipse.platform" % "org.eclipse.core.resources" % "3.20.0",
"org.eclipse.platform" % "org.eclipse.text" % "3.13.100",
"org.eclipse.platform" % "org.eclipse.core.resources" % "3.20.100",
"org.eclipse.platform" % "org.eclipse.text" % "3.14.0",
// see note in readme re self-publishing cdt-core
"io.joern" % "eclipse-cdt-core" % "8.4.0.202401242025",
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/csharpsrc2cpg/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ astGenVersion := appProperties.value.getString("csharpsrc2cpg.dotnetastgen_versi

libraryDependencies ++= Seq(
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
"com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.0",
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
)

Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/ghidra2cpg/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->t
libraryDependencies ++= Seq(
"io.joern" % "ghidra" % "11.0_PUBLIC_20231222-2",
"com.github.scopt" %% "scopt" % "4.1.0",
"commons-io" % "commons-io" % "2.13.0",
"commons-io" % "commons-io" % "2.16.0",
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
"io.shiftleft" %% "codepropertygraph-protos" % Versions.cpg,
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
Expand Down
4 changes: 2 additions & 2 deletions joern-cli/frontends/gosrc2cpg/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependsOn(Projects.dataflowengineoss % "compile->compile;test->test", Projects.x
libraryDependencies ++= Seq(
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
"org.scalatest" %% "scalatest" % Versions.scalatest % Test,
"com.lihaoyi" %% "os-lib" % "0.9.1",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2",
"com.lihaoyi" %% "os-lib" % "0.9.3",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.0",
"io.circe" %% "circe-core" % Versions.circe,
"io.circe" %% "circe-generic" % Versions.circe,
"io.circe" %% "circe-parser" % Versions.circe
Expand Down
6 changes: 3 additions & 3 deletions joern-cli/frontends/javasrc2cpg/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ dependsOn(Projects.dataflowengineoss % "compile->compile;test->test", Projects.x

libraryDependencies ++= Seq(
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
"com.github.javaparser" % "javaparser-symbol-solver-core" % "3.25.8",
"com.github.javaparser" % "javaparser-symbol-solver-core" % "3.25.9",
"org.gradle" % "gradle-tooling-api" % Versions.gradleTooling,
"org.scalatest" %% "scalatest" % Versions.scalatest % Test,
"org.projectlombok" % "lombok" % "1.18.30",
"org.projectlombok" % "lombok" % "1.18.32",
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4",
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.2.0",
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0",
"net.lingala.zip4j" % "zip4j" % "2.11.5"
)

Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/jssrc2cpg/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ astGenVersion := appProperties.value.getString("jssrc2cpg.astgen_version")

libraryDependencies ++= Seq(
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
"com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.0",
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
)

Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/kotlin2cpg/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "kotlin2cpg"

val kotlinVersion = "1.9.10"
val kotlinVersion = "1.9.23"

dependsOn(
Projects.dataflowengineoss % "compile->compile;test->test",
Expand Down
12 changes: 6 additions & 6 deletions project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ object Versions {
val cpg = parseVersion("cpgVersion")
// Dont upgrade antlr to 4.10 or above since those versions require java 11 or higher which
// causes problems upstreams.
val antlr = "4.7"
val scalatest = "3.2.16"
val cats = "3.5.0"
val antlr = "4.7.2"
val scalatest = "3.2.18"
val cats = "3.5.4"
val json4s = "4.0.7"
val gradleTooling = "8.3"
val circe = "0.14.5"
val circe = "0.14.6"
val requests = "0.8.0"
val upickle = "3.1.3"
val upickle = "3.2.0"
val scalaReplPP = "0.1.83"
val typeSafeConfig = "1.4.2"
val typeSafeConfig = "1.4.3"
val versionSort = "1.0.11"

private def parseVersion(key: String): String = {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.3")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.19")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")

0 comments on commit b4d0d8b

Please sign in to comment.