Merge pull request #28 from ShiftLeftSecurity/michael/scala-2-13-7-an…

…d-release-sequentially upgrade scala to 2.13.7 and release sequentially
ShiftLeftSecurity · Nov 11, 2021 · 534ad98 · 534ad98
2 parents 51b690a + a2a638c
commit 534ad98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,7 @@ on:
     tags: ["*"]
 jobs:
   release:
+    concurrency: release
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-val cpgVersion = "1.3.390"
+val cpgVersion = "1.3.429"
 
 val gitCommitString = SettingKey[String]("gitSha")
 
@@ -15,7 +15,7 @@ Global / excludeLintKeys += Fast / configuration
 Global / excludeLintKeys += gitCommitString
 
 lazy val commonSettings = Seq(
-  scalaVersion := "2.13.6",
+  scalaVersion := "2.13.7",
   organization := "io.shiftleft",
   scalacOptions ++= Seq(
     // Emit warning and location for usages of deprecated APIs.

diff --git a/src/test/scala/io/shiftleft/js2cpg/cpg/passes/CfgCreationPassTest.scala b/src/test/scala/io/shiftleft/js2cpg/cpg/passes/CfgCreationPassTest.scala
@@ -6,8 +6,8 @@ import io.shiftleft.codepropertygraph.generated._
 import io.shiftleft.js2cpg.core.Report
 import io.shiftleft.passes.IntervalKeyPool
 import io.shiftleft.semanticcpg.language._
-import io.shiftleft.semanticcpg.passes.CfgCreationPass
-import io.shiftleft.semanticcpg.passes.cfgcreation.Cfg._
+import io.shiftleft.semanticcpg.passes.controlflow.CfgCreationPass
+import io.shiftleft.semanticcpg.passes.controlflow.cfgcreation.Cfg._
 import overflowdb.traversal._
 import overflowdb._