Skip to content

Frontends only need to depend on dataflowengineoss for tests. #1879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Frontends only need to depend on dataflowengineoss for tests. #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion joern-cli/frontends/ghidra2cpg/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "ghidra2cpg"

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

libraryDependencies ++= Seq(
"com.github.scopt" %% "scopt" % "4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/javasrc2cpg/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name := "javasrc2cpg"
scalaVersion := "2.13.8"
crossScalaVersions := Seq("2.13.8", "3.1.3")

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

libraryDependencies ++= Seq(
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/jimple2cpg/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name := "jimple2cpg"
scalaVersion := "2.13.8"
crossScalaVersions := Seq("2.13.8", "3.1.3")

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

libraryDependencies ++= Seq(
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/jssrc2cpg/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "jssrc2cpg"
scalaVersion := "2.13.8"
crossScalaVersions := Seq("2.13.8", "3.1.3")

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

val astGenVersion = "2.2.0"

Expand Down
11 changes: 0 additions & 11 deletions joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/JsSrc2Cpg.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package io.joern.jssrc2cpg

import better.files.File
import io.joern.dataflowengineoss.layers.dataflows.{OssDataFlow, OssDataFlowOptions}
import io.joern.jssrc2cpg.JsSrc2Cpg.postProcessingPasses
import io.joern.jssrc2cpg.passes.{
AstCreationPass,
BuiltinTypesPass,
Expand Down Expand Up @@ -61,15 +59,6 @@ class JsSrc2Cpg extends X2CpgFrontend[Config] {
}
}

def createCpgWithAllOverlays(config: Config): Try[Cpg] = {
val maybeCpg = createCpgWithOverlays(config)
maybeCpg.map { cpg =>
new OssDataFlow(new OssDataFlowOptions()).run(new LayerCreatorContext(cpg))
postProcessingPasses(cpg).foreach(_.createAndApply())
cpg
}
}

}

object JsSrc2Cpg {
Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/kotlin2cpg/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "kotlin2cpg"

val kotlinVersion = "1.6.21"

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

libraryDependencies ++= Seq(
"com.github.pathikrit" %% "better-files" % "3.9.1",
Expand Down
2 changes: 1 addition & 1 deletion joern-cli/frontends/pysrc2cpg/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "pysrc2cpg"

scalaVersion := "2.13.8"

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

libraryDependencies ++= Seq(
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,
Expand Down
1 change: 1 addition & 0 deletions querydb/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ enablePlugins(JavaAppPackaging)
dependsOn(
Projects.console,
Projects.macros,
Projects.dataflowengineoss,
Projects.ghidra2cpg,
Projects.ghidra2cpg % "test->test",
Projects.c2cpg % "test->test",
Expand Down