Skip to content

Commit f4c98f8

Browse files
Updated dependencies and adapt API usage (#363)
- updated Joern (and more) and was able to get rid of tons of old helper datastructures / helper methods that are in x2cpg now - update the MacOS runner (12 is gone)
1 parent 18caaed commit f4c98f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+186
-722
lines changed

.github/workflows/pr.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,34 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
os: [ubuntu-22.04, windows-2022, macos-12]
10+
os: [ubuntu-22.04, windows-2022, macos-14]
1111
steps:
1212
- name: Checkout github repo
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 1
1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
19-
distribution: 'temurin'
20-
java-version: '11'
21-
cache: 'sbt'
19+
distribution: temurin
20+
java-version: 11
21+
cache: sbt
22+
- name: Set up SBT
23+
uses: sbt/setup-sbt@v1
2224
- name: Compile and run tests
23-
run: sbt clean +test
25+
run: sbt clean test
2426
formatting:
2527
runs-on: ubuntu-22.04
2628
steps:
27-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
2830
with:
2931
fetch-depth: 1
3032
- name: Set up JDK 11
31-
uses: actions/setup-java@v3
33+
uses: actions/setup-java@v4
3234
with:
33-
distribution: 'temurin'
34-
java-version: '11'
35-
cache: 'sbt'
35+
distribution: temurin
36+
java-version: 11
37+
cache: sbt
3638
- name: Check formatting
3739
run: sbt scalafmtCheck test:scalafmtCheck
3840
- run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'"

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Checkout github repo
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: apt-get update
@@ -22,13 +22,13 @@ jobs:
2222
env:
2323
PGP_SECRET: ${{ secrets.PGP_SECRET }}
2424
- name: Set up JDK 11
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
27-
distribution: 'temurin'
28-
java-version: '11'
29-
cache: 'sbt'
27+
distribution: temurin
28+
java-version: 11
29+
cache: sbt
3030
- name: Run tests
31-
run: sbt clean +test
31+
run: sbt clean test
3232
- name: Release to sonatype
3333
run: sbt clean ciReleaseTagNextVersion ciReleaseSonatype
3434
env:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ With this, we ensure to have ES6 compliant JS code before we continue with the a
9999
## Parsing
100100

101101
This is done by the [GraalJS Parser](https://github.com/oracle/graaljs/tree/master/graal-js/src/com.oracle.js.parser).
102-
[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.
102+
[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.
103103

104104
## CPG-Generation
105105

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
val cpgVersion = "1.7.3"
2-
val joernVersion = "4.0.8"
1+
val cpgVersion = "1.7.37"
2+
val joernVersion = "4.0.383"
33

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

@@ -16,7 +16,7 @@ Global / excludeLintKeys += Fast / configuration
1616
Global / excludeLintKeys += gitCommitString
1717

1818
lazy val commonSettings = Seq(
19-
scalaVersion := "3.4.2",
19+
scalaVersion := "3.6.4",
2020
organization := "io.shiftleft",
2121
scalacOptions ++= Seq("-Xtarget:8"),
2222
resolvers ++= Seq(
@@ -28,14 +28,14 @@ lazy val commonSettings = Seq(
2828
"io.joern" %% "x2cpg" % joernVersion,
2929
"com.github.scopt" %% "scopt" % "4.1.0",
3030
"org.graalvm.js" % "js" % "22.3.4",
31-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.15.3",
31+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.19.1",
3232
"com.atlassian.sourcemap" % "sourcemap" % "2.0.0",
33-
"commons-io" % "commons-io" % "2.13.0",
33+
"commons-io" % "commons-io" % "2.19.0",
3434
"org.slf4j" % "slf4j-api" % "2.0.7",
3535
"org.apache.logging.log4j" % "log4j-slf4j2-impl" % "2.20.0" % Optional,
3636
"org.apache.logging.log4j" % "log4j-core" % "2.20.0" % Optional,
3737
"io.joern" %% "x2cpg" % joernVersion % Test classifier "tests",
38-
"org.scalatest" %% "scalatest" % "3.2.18" % Test
38+
"org.scalatest" %% "scalatest" % "3.2.19" % Test
3939
)
4040
)
4141

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.1
1+
sbt.version=1.11.2

project/plugins.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
1+
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")
22
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
3-
addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.27")
4-
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
3+
addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.1.7")
4+
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
55
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
6+
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")

0 commit comments

Comments
 (0)