update to scala 3.5.2 (#1)

* update to scala 3.5.2 Signed-off-by: Prabhu Subramanian <[email protected]> * update protobuf and protoc Signed-off-by: Prabhu Subramanian <[email protected]> --------- Signed-off-by: Prabhu Subramanian <[email protected]>
AppThreat · Nov 17, 2024 · 0f3dcef · 0f3dcef
1 parent c055fcd
commit 0f3dcef
Show file tree

Hide file tree

Showing 19 changed files with 118 additions and 98 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -24,7 +24,7 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '21'
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.sbt

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Clone submodules
         run: git submodule update --init --recursive
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -32,3 +32,15 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Generate SBOM with cdxgen
+        run: |
+          npm install -g @cyclonedx/cdxgen
+          cdxgen -t sbt -o bom.json . -p --no-recurse
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            bom.json
diff --git a/build.sbt b/build.sbt
@@ -1,10 +1,10 @@
 name := "cpg2"
 ThisBuild / organization := "io.appthreat"
-ThisBuild / version      := "1.0.0"
-ThisBuild / scalaVersion := "3.3.1"
+ThisBuild / version      := "1.0.1"
+ThisBuild / scalaVersion := "3.5.2"
 
 // parsed by project/Versions.scala
-val overflowdbVersion = "1.0.0"
+val overflowdbVersion = "1.0.1"
 val overflowdbCodegenVersion = "2.103"
 
 ThisBuild / Test / fork           := true

diff --git a/codepropertygraph/build.sbt b/codepropertygraph/build.sbt
@@ -5,7 +5,7 @@ dependsOn(Projects.protoBindings, Projects.domainClasses)
 libraryDependencies ++= Seq(
   "io.appthreat"          %% "odb2-traversal" % Versions.overflowdb,
   "io.appthreat"          %% "odb2-formats"   % Versions.overflowdb,
-  "com.github.scopt"      %% "scopt"                % "4.0.1",
+  "com.github.scopt"      %% "scopt"                % "4.1.0",
   "com.github.pathikrit"  %% "better-files"         % "3.9.2",
   "org.scalatest"         %% "scalatest"            % Versions.scalatest % Test
 )

diff --git a/codepropertygraph/src/main/scala/io/shiftleft/SerializedCpg.scala b/codepropertygraph/src/main/scala/io/shiftleft/SerializedCpg.scala
@@ -11,8 +11,8 @@ class SerializedCpg extends AutoCloseable:
 
     /** We allow creating a dummy serialized CPG that does not do anything.
       */
-    private[this] var zipFileSystem: FileSystem = null
-    private[this] var counter                   = 0
+    private var zipFileSystem: FileSystem = null
+    private var counter                   = 0
 
     /** Create Serialized CPG from existing file. If the file does not exist, an empty Serialized
       * CPG is created.
@@ -25,7 +25,7 @@ class SerializedCpg extends AutoCloseable:
 
     @throws[URISyntaxException]
     @throws[IOException]
-    private[this] def initZipFilesystem(filename: String): Unit =
+    private def initZipFilesystem(filename: String): Unit =
         val env = new util.HashMap[String, AnyRef]
         // This ensures that the file is created if it does not exist
         env.put("create", "true")

diff --git a/...opertygraph/src/test/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoaderTests.scala b/...opertygraph/src/test/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoaderTests.scala
@@ -11,7 +11,7 @@ import overflowdb.Config
   */
 class CpgLoaderTests extends AnyWordSpec with Matchers with BeforeAndAfterAll {
 
-  var zipFile: better.files.File = _
+  var zipFile: better.files.File = scala.compiletime.uninitialized
 
   override def beforeAll(): Unit = {
     zipFile = TestProtoCpg.createTestProtoCpg

diff --git a/domainClasses/build.sbt b/domainClasses/build.sbt
@@ -7,6 +7,12 @@ generatedSrcDir := (Compile/sourceDirectory).value / "generated"
 Compile/unmanagedSourceDirectories += generatedSrcDir.value
 Compile/compile := (Compile/compile).dependsOn(Projects.schema/Compile/generateDomainClasses).value
 
+ThisBuild / scalacOptions ++= Seq(
+  "-rewrite",
+  "-source",
+  "3.4-migration"
+)
+
 /* generated sources occasionally have some warnings..
  * we're trying to minimise them on a best effort basis, but don't want
  * to fail the build because of them

diff --git a/...inClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/package.scala b/...inClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/package.scala
@@ -4,7 +4,7 @@ import overflowdb.*
 import scala.jdk.CollectionConverters.*
 
 object PropertyErrorRegister:
-    private var errorMap = Set[(Class[_], String)]()
+    private var errorMap = Set[(Class[?], String)]()
     private val logger   = org.slf4j.LoggerFactory.getLogger(getClass)
 
     def logPropertyErrorIfFirst(clazz: Class[?], propertyName: String): Unit =
@@ -13,7 +13,7 @@ object PropertyErrorRegister:
             errorMap += ((clazz, propertyName))
 
 object Factories:
-    lazy val all: Seq[EdgeFactory[_]] = Seq(
+    lazy val all: Seq[EdgeFactory[?]] = Seq(
       AliasOf.factory,
       Argument.factory,
       Ast.factory,
@@ -39,5 +39,5 @@ object Factories:
       SourceFile.factory,
       TaggedBy.factory
     )
-    lazy val allAsJava: java.util.List[EdgeFactory[_]] = all.asJava
+    lazy val allAsJava: java.util.List[EdgeFactory[?]] = all.asJava
 end Factories