diff --git a/.gitignore b/.gitignore index 86ed73b53..f4239332b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .bsp/ +null .idea/ /build/ target diff --git a/build.sbt b/build.sbt index 94d90757d..05d3ff6ca 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ -val cpgVersion = "1.3.582" -val joernVersion = "1.1.1357" +val cpgVersion = "1.3.585" +val joernVersion = "1.1.1378" val gitCommitString = SettingKey[String]("gitSha") @@ -100,7 +100,7 @@ lazy val commonSettings = Seq( "org.slf4j" % "slf4j-api" % "1.7.36", "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.18.0" % Runtime, "io.joern" %% "x2cpg" % joernVersion % Test classifier "tests", - "org.scalatest" %% "scalatest" % "3.2.14" % Test + "org.scalatest" %% "scalatest" % "3.2.15" % Test ) ) diff --git a/project/build.properties b/project/build.properties index 22af2628c..46e43a97e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 +sbt.version=1.8.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 17404594f..74fdda6f3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11") +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-assembly" % "1.1.0") diff --git a/src/test/scala/io/shiftleft/js2cpg/passes/CfgCreationPassTest.scala b/src/test/scala/io/shiftleft/js2cpg/passes/CfgCreationPassTest.scala index a5cd55201..e7b61f299 100644 --- a/src/test/scala/io/shiftleft/js2cpg/passes/CfgCreationPassTest.scala +++ b/src/test/scala/io/shiftleft/js2cpg/passes/CfgCreationPassTest.scala @@ -838,8 +838,7 @@ class CfgCreationPassTest extends AnyWordSpec with Matchers { ("param1_0", 1, FalseEdge) ) succOf("param1_0", 1) shouldBe expected(("param1_0 === void 0 ? {} : param1_0", AlwaysEdge)) - succOf("_tmp_1") shouldBe expected(("{}", AlwaysEdge)) - succOf("{}") shouldBe expected(("param1_0 === void 0 ? {} : param1_0", AlwaysEdge)) + succOf("_tmp_1") shouldBe expected(("param1_0 === void 0 ? {} : param1_0", AlwaysEdge)) succOf("param1_0 === void 0 ? {} : param1_0") shouldBe expected( ("_tmp_0 = param1_0 === void 0 ? {} : param1_0", AlwaysEdge) ) @@ -853,8 +852,7 @@ class CfgCreationPassTest extends AnyWordSpec with Matchers { ("_tmp_2", TrueEdge), // holds {} ("_tmp_0", 2, FalseEdge) ) - succOf("_tmp_2") shouldBe expected(("{}", 1, AlwaysEdge)) - succOf("{}", 1) shouldBe expected(("_tmp_0.id === void 0 ? {} : _tmp_0.id", AlwaysEdge)) + succOf("_tmp_2") shouldBe expected(("_tmp_0.id === void 0 ? {} : _tmp_0.id", AlwaysEdge)) succOf("_tmp_0", 2) shouldBe expected(("id", 2, AlwaysEdge)) succOf("_tmp_0.id === void 0 ? {} : _tmp_0.id") shouldBe expected(