Revert "Updated joern, cpg, and re-used x2cpg API (#337)" (#346)

This reverts commit 6c2c3a5.

.github/workflows/pr.yml

@@ -20,7 +20,7 @@ jobs:
           java-version: '11'
           cache: 'sbt'
       - name: Compile and run tests
-        run: sbt test
+        run: sbt clean +test
   formatting:
     runs-on: ubuntu-22.04
     steps:
@@ -34,6 +34,6 @@ jobs:
           java-version: '11'
           cache: 'sbt'
       - name: Check formatting
-        run: sbt scalafmtCheck Test/scalafmtCheck
+        run: sbt scalafmtCheck test:scalafmtCheck
       - run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'"
         if: ${{ failure() }}

build.sbt

@@ -1,5 +1,5 @@
-val cpgVersion   = "1.6.13"
-val joernVersion = "2.0.392"
+val cpgVersion   = "1.6.11"
+val joernVersion = "2.0.335"
 
 val gitCommitString = SettingKey[String]("gitSha")
 
@@ -27,11 +27,10 @@ lazy val commonSettings = Seq(
     "io.shiftleft"              %% "codepropertygraph" % cpgVersion,
     "io.joern"                  %% "x2cpg"             % joernVersion,
     "com.github.scopt"          %% "scopt"             % "4.1.0",
-    // do not update to 23.x as this requires JDK >= 19
-    "org.graalvm.js"             % "js"                % "22.3.5",
-    "com.fasterxml.jackson.core" % "jackson-databind"  % "2.17.1",
+    "org.graalvm.js"             % "js"                % "22.3.4",
+    "com.fasterxml.jackson.core" % "jackson-databind"  % "2.15.3",
     "com.atlassian.sourcemap"    % "sourcemap"         % "2.0.0",
-    "commons-io"                 % "commons-io"        % "2.16.1",
+    "commons-io"                 % "commons-io"        % "2.13.0",
     "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,

project/plugins.sbt

@@ -2,4 +2,4 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager"  % "1.9.16")
 addSbtPlugin("org.scalameta"  % "sbt-scalafmt"         % "2.5.0")
 addSbtPlugin("io.shiftleft"   % "sbt-ci-release-early" % "2.0.27")
 addSbtPlugin("com.dwijnand"   % "sbt-dynver"           % "4.1.1")
-addSbtPlugin("com.eed3si9n"   % "sbt-buildinfo"        % "0.12.0")
+addSbtPlugin("com.eed3si9n"   % "sbt-buildinfo"        % "0.10.0")

src/main/scala/io/shiftleft/js2cpg/astcreation/AstEdgeBuilder.scala

@@ -6,7 +6,7 @@ import io.shiftleft.js2cpg.datastructures.OrderTracker
 import overflowdb.BatchedUpdate.DiffGraphBuilder
 import org.slf4j.LoggerFactory
 
-trait AstEdgeBuilder { this: AstCreator =>
+class AstEdgeBuilder(private val diffGraph: DiffGraphBuilder) {
 
   private val logger = LoggerFactory.getLogger(getClass)