Skip to content
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

Jump to bottom

upgrade cpg #546

Merged
merged 5 commits into from
Jun 15, 2021
Merged

upgrade cpg #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaa9afb
upgrade cpg
mpollmeier Jun 13, 2021
f65647f
upgrade scala/cpg/sbt
mpollmeier Jun 14, 2021
f32941e
inherit ammonite version from cpg
mpollmeier Jun 14, 2021
c2b4c4d
configure NodeExtensionFinder
mpollmeier Jun 14, 2021
0d6936e
latest latest deps
mpollmeier Jun 15, 2021
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
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ enablePlugins(GitVersioning)

name := "joern"
organization := "io.shiftleft"
ThisBuild / scalaVersion := "2.13.4"
ThisBuild / scalaVersion := "2.13.6"
ThisBuild /Test /fork := true
val cpgVersion = "1.3.191"
val cpgVersion = "1.3.198"

ThisBuild / resolvers ++= Seq(
Resolver.mavenLocal,
Expand Down
2 changes: 0 additions & 2 deletions joern-cli/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ libraryDependencies ++= Seq(
"io.github.plume-oss" % "plume" % "0.5.11" exclude("io.github.plume-oss", "cpgconv"),

"com.lihaoyi" %% "requests" % "0.6.5",
"com.lihaoyi" %% "ammonite" % "2.3.8-4-88785969" cross CrossVersion.full,
"com.github.scopt" %% "scopt" % "3.7.1",
"com.github.pathikrit" %% "better-files" % "3.9.1",
"io.circe" %% "circe-generic" % "0.12.2",
Expand All @@ -24,7 +23,6 @@ libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
)


enablePlugins(JavaAppPackaging)
scriptClasspath := Seq("*") //wildcard import from staged `lib` dir, for simplicity and also to avoid `line too long` error on windows

Expand Down
4 changes: 3 additions & 1 deletion joern-cli/src/main/scala/io/shiftleft/joern/JoernScan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ import org.json4s.native.Serialization
import better.files._
import io.shiftleft.dataflowengineoss.semanticsloader.Semantics
import io.shiftleft.joern.Scan.{allTag, defaultTag}
import io.shiftleft.semanticcpg.language.{DefaultNodeExtensionFinder, NodeExtensionFinder}

import scala.reflect.runtime.universe._

object JoernScanConfig {
val defaultDbVersion: String = "0.0.89"
val defaultDbVersion: String = "0.0.92"
}

case class JoernScanConfig(src: String = "",
Expand Down Expand Up @@ -168,6 +169,7 @@ class ScanOptions(var maxCallDepth: Int, var names: Array[String], var tags: Arr
extends LayerCreatorOptions {}

class Scan(options: ScanOptions)(implicit engineContext: EngineContext) extends LayerCreator {
implicit val finder: NodeExtensionFinder = DefaultNodeExtensionFinder

override val overlayName: String = Scan.overlayName
override val description: String = Scan.description
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.1
sbt.version=1.5.4