From 4f5957251c257ca21d258f3dc9a9d1640f81bc43 Mon Sep 17 00:00:00 2001 From: bbrehm Date: Thu, 30 Jan 2025 17:59:08 +0100 Subject: [PATCH] update codepropertygraph+flatgraph deps (#5270) --- build.sbt | 2 +- .../test/scala/io/joern/rubysrc2cpg/querying/ImportTests.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 09d000f5e3f5..c6db2851d11f 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "joern" ThisBuild / organization := "io.joern" ThisBuild / scalaVersion := "3.5.2" -val cpgVersion = "1.7.23" +val cpgVersion = "1.7.25" lazy val joerncli = Projects.joerncli lazy val querydb = Projects.querydb diff --git a/joern-cli/frontends/rubysrc2cpg/src/test/scala/io/joern/rubysrc2cpg/querying/ImportTests.scala b/joern-cli/frontends/rubysrc2cpg/src/test/scala/io/joern/rubysrc2cpg/querying/ImportTests.scala index c39025784a43..6bde5d541028 100644 --- a/joern-cli/frontends/rubysrc2cpg/src/test/scala/io/joern/rubysrc2cpg/querying/ImportTests.scala +++ b/joern-cli/frontends/rubysrc2cpg/src/test/scala/io/joern/rubysrc2cpg/querying/ImportTests.scala @@ -452,7 +452,7 @@ class ImportTests extends RubyCode2CpgFixture(withPostProcessing = true) with In |""".stripMargin) "also create import nodes" in { - inside(cpg.imports.l) { + inside(cpg.imports.l.sortBy { impNode => impNode.isCallForImportIn.head.order }) { case requireAll :: requireRelative :: load :: Nil => requireAll.importedAs shouldBe Option("./dir") requireAll.isWildcard shouldBe Option(true)