Skip to content

Commit

Permalink
Updated joern, cpg, and re-used x2cpg API
Browse files Browse the repository at this point in the history
This is a rather large change as we have to update joern which brings in a lot of new stuff.

FILE.content and offset calculation is NOT part of this PR.
  • Loading branch information
max-leuthaeuser committed Mar 21, 2024
1 parent 2d893db commit e60ba32
Show file tree
Hide file tree
Showing 49 changed files with 1,001 additions and 1,351 deletions.
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val cpgVersion = "1.4.25"
val joernVersion = "2.0.140"
val cpgVersion = "1.6.6"
val joernVersion = "2.0.300"

val gitCommitString = SettingKey[String]("gitSha")

Expand Down Expand Up @@ -27,15 +27,15 @@ lazy val commonSettings = Seq(
"io.shiftleft" %% "codepropertygraph" % cpgVersion,
"io.joern" %% "x2cpg" % joernVersion,
"com.github.scopt" %% "scopt" % "4.1.0",
"org.graalvm.js" % "js" % "22.3.4",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.15.3",
"org.graalvm.js" % "js" % "22.3.5",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.0",
"com.atlassian.sourcemap" % "sourcemap" % "2.0.0",
"commons-io" % "commons-io" % "2.13.0",
"commons-io" % "commons-io" % "2.15.1",
"org.slf4j" % "slf4j-api" % "2.0.7",
"org.apache.logging.log4j" % "log4j-slf4j2-impl" % "2.20.0" % Optional,
"org.apache.logging.log4j" % "log4j-core" % "2.20.0" % Optional,
"io.joern" %% "x2cpg" % joernVersion % Test classifier "tests",
"org.scalatest" %% "scalatest" % "3.2.17" % Test
"org.scalatest" %% "scalatest" % "3.2.18" % Test
)
)

Expand Down
742 changes: 331 additions & 411 deletions src/main/scala/io/shiftleft/js2cpg/astcreation/AstCreator.scala

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.shiftleft.js2cpg.datastructures.OrderTracker
import overflowdb.BatchedUpdate.DiffGraphBuilder
import org.slf4j.LoggerFactory

class AstEdgeBuilder(private val diffGraph: DiffGraphBuilder) {
trait AstEdgeBuilder { this: AstCreator =>

private val logger = LoggerFactory.getLogger(getClass)

Expand Down
Loading

0 comments on commit e60ba32

Please sign in to comment.