upgrade to latest

ShiftLeftSecurity · Jul 22, 2024 · 134f4a1 · 134f4a1
1 parent 146c76a
commit 134f4a1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
-val cpgVersion   = "1.6.11+7-20e32cf2"
-val joernVersion = "2.0.355+20-96b6881d"
+val cpgVersion   = "1.7.3"
+val joernVersion = "4.0.8"
 
 val gitCommitString = SettingKey[String]("gitSha")
 
@@ -16,7 +16,7 @@ Global / excludeLintKeys += Fast / configuration
 Global / excludeLintKeys += gitCommitString
 
 lazy val commonSettings = Seq(
-  scalaVersion := "3.4.1",
+  scalaVersion := "3.4.2",
   organization := "io.shiftleft",
   scalacOptions ++= Seq("-Xtarget:8"),
   resolvers ++= Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.1
diff --git a/src/main/scala/io/shiftleft/js2cpg/astcreation/NewCompositeNode.scala b/src/main/scala/io/shiftleft/js2cpg/astcreation/NewCompositeNode.scala
@@ -16,7 +16,7 @@ class NewCompositeNode(underlying: ListBuffer[NewNode] = ListBuffer.empty[NewNod
 
   override def productElement(n: Int): Any = null
 
-  override def copy(): this.type = {
+  override def copy: this.type = {
     val newInstance = new NewCompositeNode(underlying.clone())
     newInstance.asInstanceOf[this.type]
   }
@@ -29,9 +29,9 @@ class NewCompositeNode(underlying: ListBuffer[NewNode] = ListBuffer.empty[NewNod
     underlying.foreach(func)
   }
 
-  override def isValidInNeighbor(edgeLabel: String, node: NewNode): Boolean  = ??? // we do not need this
-  override def isValidOutNeighbor(edgeLabel: String, node: NewNode): Boolean = ??? // we do not need this
-  override def propertiesMap: util.Map[String, Any]                          = ??? // we do not need this
+  override def isValidInNeighbor(edgeLabel: String, node: NewNode): Boolean     = ??? // we do not need this
+  override def isValidOutNeighbor(edgeLabel: String, node: NewNode): Boolean    = ??? // we do not need this
+  override def propertiesMap: util.Map[String, Any]                             = ??? // we do not need this
+  override def countAndVisitProperties(interface: BatchedUpdateInterface): Unit = ???
   override type StoredNodeType = StoredNode
-  override def flattenProperties(interface: BatchedUpdateInterface): Unit = ???
 }
diff --git a/src/test/scala/io/shiftleft/js2cpg/passes/SimpleAstCreationPassTest.scala b/src/test/scala/io/shiftleft/js2cpg/passes/SimpleAstCreationPassTest.scala
@@ -726,7 +726,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
         switchExpr.code shouldBe "x"
 
         val List(switchBlock) = switch.astChildren.isBlock.l
-        val List(caseLabel)   = switchBlock.jumpTargetViaAstOut.codeExact("case 1:").l
+        val List(caseLabel)   = switchBlock._jumpTargetViaAstOut.codeExact("case 1:").l
         caseLabel.order shouldBe 1
         val List(caseExpr) = switchBlock.astChildren.isLiteral.codeExact("1").l
         caseExpr.order shouldBe 2
@@ -745,7 +745,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
         switchExpr.code shouldBe "x"
 
         val List(switchBlock) = switch.astChildren.isBlock.l
-        val List(caseLabel1)  = switchBlock.jumpTargetViaAstOut.codeExact("case 1:").l
+        val List(caseLabel1)  = switchBlock._jumpTargetViaAstOut.codeExact("case 1:").l
         caseLabel1.order shouldBe 1
 
         val List(caseExpr1) = switchBlock.astChildren.isLiteral.codeExact("1").l
@@ -754,7 +754,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
         val List(identifierY) = switchBlock.astChildren.isIdentifier.codeExact("y").l
         identifierY.order shouldBe 3
 
-        val List(caseLabel2) = switchBlock.jumpTargetViaAstOut.codeExact("case 2:").l
+        val List(caseLabel2) = switchBlock._jumpTargetViaAstOut.codeExact("case 2:").l
         caseLabel2.order shouldBe 4
 
         val List(caseExpr2) = switchBlock.astChildren.isLiteral.codeExact("2").l
@@ -777,13 +777,13 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
           switchExpr.code shouldBe "x"
 
           val List(switchBlock) = switch.astChildren.isBlock.l
-          val List(caseLabel1)  = switchBlock.jumpTargetViaAstOut.codeExact("case 1:").l
+          val List(caseLabel1)  = switchBlock._jumpTargetViaAstOut.codeExact("case 1:").l
           caseLabel1.order shouldBe 1
 
           val List(caseExpr1) = switchBlock.astChildren.isLiteral.codeExact("1").l
           caseExpr1.order shouldBe 2
 
-          val List(caseLabel2) = switchBlock.jumpTargetViaAstOut.codeExact("case 2:").l
+          val List(caseLabel2) = switchBlock._jumpTargetViaAstOut.codeExact("case 2:").l
           caseLabel2.order shouldBe 3
 
           val List(caseExpr2) = switchBlock.astChildren.isLiteral.codeExact("2").l
@@ -807,14 +807,14 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
         switchExpr.code shouldBe "x"
 
         val List(switchBlock) = switch.astChildren.isBlock.l
-        val List(caseLabel1)  = switchBlock.jumpTargetViaAstOut.codeExact("case 1:").l
+        val List(caseLabel1)  = switchBlock._jumpTargetViaAstOut.codeExact("case 1:").l
         caseLabel1.order shouldBe 1
 
         val List(caseExpr1) = switchBlock.astChildren.isLiteral.codeExact("1").l
         caseExpr1.order shouldBe 2
 
         val List(caseLabel2) =
-          switchBlock.jumpTargetViaAstOut.codeExact("case 2:").l
+          switchBlock._jumpTargetViaAstOut.codeExact("case 2:").l
         caseLabel2.order shouldBe 3
 
         val List(caseExpr2) = switchBlock.astChildren.isLiteral.codeExact("2").l
@@ -825,7 +825,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
         identifierY.order shouldBe 5
 
         val List(caseLabel3) =
-          switchBlock.jumpTargetViaAstOut.codeExact("case 3:").l
+          switchBlock._jumpTargetViaAstOut.codeExact("case 3:").l
         caseLabel3.order shouldBe 6
 
         val List(caseExpr3) = switchBlock.astChildren.isLiteral.codeExact("3").l
@@ -850,7 +850,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
         programBlock.astChildren.isLiteral.size shouldBe 0
 
         val List(switchBlock) = switch.astChildren.isBlock.l
-        val List(caseLabel)   = switchBlock.jumpTargetViaAstOut.codeExact("default:").l
+        val List(caseLabel)   = switchBlock._jumpTargetViaAstOut.codeExact("default:").l
         caseLabel.order shouldBe 1
 
         val List(identifierY) = switchBlock.astChildren.isIdentifier.nameExact("y").l
@@ -871,7 +871,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
         switchExpr.code shouldBe "x"
 
         val List(switchBlock) = switch.astChildren.isBlock.l
-        val List(caseLabel1)  = switchBlock.jumpTargetViaAstOut.codeExact("case 1:").l
+        val List(caseLabel1)  = switchBlock._jumpTargetViaAstOut.codeExact("case 1:").l
         caseLabel1.order shouldBe 1
 
         val List(caseExpr1) = switchBlock.astChildren.isLiteral.codeExact("1").l
@@ -884,7 +884,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
           switchBlock.astChildren.isControlStructure.controlStructureTypeExact(ControlStructureTypes.BREAK).l
         break.order shouldBe 4
 
-        val List(caseLabel2) = switchBlock.jumpTargetViaAstOut.codeExact("default:").l
+        val List(caseLabel2) = switchBlock._jumpTargetViaAstOut.codeExact("default:").l
         caseLabel2.order shouldBe 5
 
         val List(identifierZ) = switchBlock.astChildren.isIdentifier.nameExact("z").l
@@ -905,7 +905,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
 
           val List(topLevelSwitchBlock) = topLevelSwitch.astChildren.isBlock.l
 
-          val List(topLevelCaseLabel) = topLevelSwitchBlock.jumpTargetViaAstOut.codeExact("default:").l
+          val List(topLevelCaseLabel) = topLevelSwitchBlock._jumpTargetViaAstOut.codeExact("default:").l
           topLevelCaseLabel.order shouldBe 1
 
           val List(nestedSwitch) = topLevelSwitchBlock.astChildren.isControlStructure.l
@@ -916,7 +916,7 @@ class SimpleAstCreationPassTest extends AbstractPassTest {
           nestedSwitchExpr.code shouldBe "y"
 
           val List(nestedSwitchBlock) = nestedSwitch.astChildren.isBlock.l
-          val List(nestedCaseLabel)   = nestedSwitchBlock.jumpTargetViaAstOut.codeExact("default:").l
+          val List(nestedCaseLabel)   = nestedSwitchBlock._jumpTargetViaAstOut.codeExact("default:").l
           nestedCaseLabel.order shouldBe 1
 
           val List(identifierZ) = nestedSwitchBlock.astChildren.isIdentifier.nameExact("z").l