Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 14 additions & 12 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,34 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-2022, macos-12]
os: [ubuntu-22.04, windows-2022, macos-14]
steps:
- name: Checkout github repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
cache: 'sbt'
distribution: temurin
java-version: 11
cache: sbt
- name: Set up SBT
uses: sbt/setup-sbt@v1
- name: Compile and run tests
run: sbt clean +test
run: sbt clean test
formatting:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
cache: 'sbt'
distribution: temurin
java-version: 11
cache: sbt
- name: Check formatting
run: sbt scalafmtCheck test:scalafmtCheck
- run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout github repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: apt-get update
Expand All @@ -22,13 +22,13 @@ jobs:
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
cache: 'sbt'
distribution: temurin
java-version: 11
cache: sbt
- name: Run tests
run: sbt clean +test
run: sbt clean test
- name: Release to sonatype
run: sbt clean ciReleaseTagNextVersion ciReleaseSonatype
env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ With this, we ensure to have ES6 compliant JS code before we continue with the a
## Parsing

This is done by the [GraalJS Parser](https://github.com/oracle/graaljs/tree/master/graal-js/src/com.oracle.js.parser).
[Standard visitor pattern](https://github.com/ShiftLeftSecurity/js2cpg/blob/master/src/main/scala/io/shiftleft/js2cpg/parser/GeneralizingAstVisitor.scala) is used to traverse the resulting JS AST afterwards for our CPG-generation.
[Standard visitor pattern](https://github.com/ShiftLeftSecurity/js2cpg/blob/master/src/main/scala/io/shiftleft/js2cpg/parser/GeneralizingAstVisitor.scala) is used to traverse the resulting JS AST afterward for our CPG-generation.

## CPG-Generation

Expand Down
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.7.3"
val joernVersion = "4.0.8"
val cpgVersion = "1.7.37"
val joernVersion = "4.0.383"

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

Expand All @@ -16,7 +16,7 @@ Global / excludeLintKeys += Fast / configuration
Global / excludeLintKeys += gitCommitString

lazy val commonSettings = Seq(
scalaVersion := "3.4.2",
scalaVersion := "3.6.4",
organization := "io.shiftleft",
scalacOptions ++= Seq("-Xtarget:8"),
resolvers ++= Seq(
Expand All @@ -28,14 +28,14 @@ lazy val commonSettings = Seq(
"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",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.19.1",
"com.atlassian.sourcemap" % "sourcemap" % "2.0.0",
"commons-io" % "commons-io" % "2.13.0",
"commons-io" % "commons-io" % "2.19.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,
"io.joern" %% "x2cpg" % joernVersion % Test classifier "tests",
"org.scalatest" %% "scalatest" % "3.2.18" % Test
"org.scalatest" %% "scalatest" % "3.2.19" % Test
)
)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.11.2
7 changes: 4 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")
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("io.shiftleft" % "sbt-ci-release-early" % "2.1.7")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
Loading