From 2b0fda708e3d66e6297e35b449f670f4d2bfc098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20Leuth=C3=A4user?= <1417198+max-leuthaeuser@users.noreply.github.com> Date: Mon, 19 Oct 2026 12:37:23 +0200 Subject: [PATCH] Bump Scala to 3.9.0 and flatgraph to 0.1.36 - sbt and Bazel build - rules_scala 7.2.5 -> 7.3.0 - bazel_tooling -> 86bbf2b (Scala 3.9.0) - flatgraph 0.1.35 -> 0.1.36, repin maven_install.json --- MODULE.bazel | 14 +++++++------- MODULE.bazel.lock | 4 ++-- bazel/scala.bzl | 2 +- build.sbt | 4 ++-- maven_install.json | 48 +++++++++++++++++++++++----------------------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index dfc68a5a7..39339e7a9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,7 +6,7 @@ bazel_dep(name = "rules_jvm_external", version = "7.0") bazel_dep(name = "aspect_rules_lint", version = "2.5.2") bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.2") -BAZEL_TOOLING_VERSION = "fbdfc66995360c408ecf94d34837a0355aa7ac4d" +BAZEL_TOOLING_VERSION = "86bbf2be26dc7a2517a56c90e12fd9a6ed20dd25" git_override( module_name = "bazel_tooling", @@ -14,14 +14,14 @@ git_override( remote = "git@github.com:joernio/bazel_tooling.git", ) -bazel_dep(name = "rules_scala", version = "7.2.5") +bazel_dep(name = "rules_scala", version = "7.3.0") scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", ) scala_config.settings( - scala_version = "3.8.3", + scala_version = "3.9.0", ) scala_deps = use_extension( @@ -38,10 +38,10 @@ maven.install( name = "maven", artifacts = [ "org.slf4j:slf4j-api:2.0.17", - "io.joern:flatgraph-core_3:0.1.35", - "io.joern:flatgraph-help_3:0.1.35", - "io.joern:flatgraph-domain-classes-generator_3:0.1.35", - "io.joern:flatgraph-odb-convert_3:0.1.35", + "io.joern:flatgraph-core_3:0.1.36", + "io.joern:flatgraph-help_3:0.1.36", + "io.joern:flatgraph-domain-classes-generator_3:0.1.36", + "io.joern:flatgraph-odb-convert_3:0.1.36", "net.sf.trove4j:core:3.1.0", "com.google.protobuf:protobuf-java:4.34.1", "com.lihaoyi:ujson_3:4.4.3", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 6896caac8..a9fff93ca 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -312,8 +312,8 @@ "https://bcr.bazel.build/modules/rules_rust/0.45.1/MODULE.bazel": "a69d0db3a958fab2c6520961e1b2287afcc8b36690fd31bbc4f6f7391397150d", "https://bcr.bazel.build/modules/rules_rust/0.67.0/MODULE.bazel": "87c3816c4321352dcfd9e9e26b58e84efc5b21351ae3ef8fb5d0d57bde7237f5", "https://bcr.bazel.build/modules/rules_rust/0.67.0/source.json": "a8ef4d3be30eb98e060cad9e5875a55b603195487f76e01b619b51a1df4641cc", - "https://bcr.bazel.build/modules/rules_scala/7.2.5/MODULE.bazel": "c5f0ee85f6c6a081a19be8a54f34ba2c2e49adeea1e7d64600bb591c27007de3", - "https://bcr.bazel.build/modules/rules_scala/7.2.5/source.json": "25be05ededbad97a8eee6e6bc3353aeee2d39402c606c019a87b1655dcdd8175", + "https://bcr.bazel.build/modules/rules_scala/7.3.0/MODULE.bazel": "4e8808421b12f006eb87391c6aa8745a205e7b61efa99a85491e989b76f47b15", + "https://bcr.bazel.build/modules/rules_scala/7.3.0/source.json": "74616885cf1d89e81c121f3658b96b11e9e42cdf5dbcd65df096fbd1b913661b", "https://bcr.bazel.build/modules/rules_shell/0.1.2/MODULE.bazel": "66e4ca3ce084b04af0b9ff05ff14cab4e5df7503973818bb91cbc6cda08d32fc", "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b", diff --git a/bazel/scala.bzl b/bazel/scala.bzl index 78a489705..5b8a4e99e 100644 --- a/bazel/scala.bzl +++ b/bazel/scala.bzl @@ -1,7 +1,7 @@ load("@bazel_tooling//:scala_rule_factory.bzl", "make_scala_rules") _rules = make_scala_rules( - scala_version = "3.8.3", + scala_version = "3.9.0", common_scalacopts = [ "-java-output-version", "17", diff --git a/build.sbt b/build.sbt index 0d1391f3c..732d1c48d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,12 @@ name := "codepropertygraph" // parsed by project/Versions.scala, updated by updateDependencies.sh -val flatgraphVersion = "0.1.35" +val flatgraphVersion = "0.1.36" inThisBuild( List( organization := "io.shiftleft", - scalaVersion := "3.8.3", + scalaVersion := "3.9.0", resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"), packageDoc / publishArtifact := true, packageSrc / publishArtifact := true, diff --git a/maven_install.json b/maven_install.json index 57c71f62b..75343a6d3 100644 --- a/maven_install.json +++ b/maven_install.json @@ -9,10 +9,10 @@ "com.google.protobuf:protobuf-java": 1237026331, "com.lihaoyi:os-lib_3": 899915638, "com.lihaoyi:ujson_3": 1182647324, - "io.joern:flatgraph-core_3": 1060140408, - "io.joern:flatgraph-domain-classes-generator_3": -1894114436, - "io.joern:flatgraph-help_3": -138228966, - "io.joern:flatgraph-odb-convert_3": 1959782918, + "io.joern:flatgraph-core_3": -747314055, + "io.joern:flatgraph-domain-classes-generator_3": 593398397, + "io.joern:flatgraph-help_3": -1945683429, + "io.joern:flatgraph-odb-convert_3": 152328455, "net.sf.trove4j:core": 1808260229, "org.scala-lang:scala-library": 1230160761, "org.scala-lang:scala3-library_3": 1771369610, @@ -53,14 +53,14 @@ "com.typesafe:config:jar:sources": 1794326800, "io.get-coursier:interface": 1635041630, "io.get-coursier:interface:jar:sources": -37171318, - "io.joern:flatgraph-core_3": 1182992137, - "io.joern:flatgraph-core_3:jar:sources": 575284637, - "io.joern:flatgraph-domain-classes-generator_3": 170340065, - "io.joern:flatgraph-domain-classes-generator_3:jar:sources": -123490520, - "io.joern:flatgraph-help_3": 1193217379, - "io.joern:flatgraph-help_3:jar:sources": -1476209185, - "io.joern:flatgraph-odb-convert_3": -1299461830, - "io.joern:flatgraph-odb-convert_3:jar:sources": 1706697962, + "io.joern:flatgraph-core_3": -589013217, + "io.joern:flatgraph-core_3:jar:sources": 802498168, + "io.joern:flatgraph-domain-classes-generator_3": 578529197, + "io.joern:flatgraph-domain-classes-generator_3:jar:sources": 159333088, + "io.joern:flatgraph-help_3": -335386351, + "io.joern:flatgraph-help_3:jar:sources": -228043010, + "io.joern:flatgraph-odb-convert_3": 378331389, + "io.joern:flatgraph-odb-convert_3:jar:sources": 2066492454, "io.shiftleft:overflowdb-core_3": -1655377345, "io.shiftleft:overflowdb-core_3:jar:sources": 422126785, "net.oneandone.reflections8:reflections8": -362476393, @@ -210,31 +210,31 @@ }, "io.joern:flatgraph-core_3": { "shasums": { - "jar": "00437da45d6636049b316b5308c3e578b776680077e6d3bdad3c3df776c036b6", - "sources": "72f6932954e33412d790a7b3737c428163110a2e99cf3f398f0c8865fe73a845" + "jar": "e73417800e5e423aa149daa6a3ec7c81d48955d0dd38a3f24945c3e4661bf934", + "sources": "492367dfeeb835ef75bcb69bcde32cb1140c303ca90ca0f73611e83cb6a499f3" }, - "version": "0.1.35" + "version": "0.1.36" }, "io.joern:flatgraph-domain-classes-generator_3": { "shasums": { - "jar": "a64f8ea84a0ced62e3a4d5702ff87959bf0fb3cfe55d8856d82779d550d59d33", - "sources": "81632035a3c029f0de74c7a477c24b576056c5573371ed95206ac6f6f8a30217" + "jar": "c4bd96840601a7a9f671cf96637ccb69d61fb19a6ba2100187ff8666665e0de4", + "sources": "7741a1000d357303fd7a306c99a5acafce20803790570333790cf8561ae0afe3" }, - "version": "0.1.35" + "version": "0.1.36" }, "io.joern:flatgraph-help_3": { "shasums": { - "jar": "10bc62d8815dcfa333b3a48088c8f3301a4380c7d6691a9eed791f44a8df6dca", - "sources": "8c7698fc70274487e265f61472154be0fee88a18cf24f05dc3cf11e998b4986b" + "jar": "c6913df75b5d6b79215477617f599269aead9a8e2208a2a9e63d6533a462bde5", + "sources": "dc1db6f9b6374dad68b1aca2458e90d4a672d335527360bc54bf2b149feaf352" }, - "version": "0.1.35" + "version": "0.1.36" }, "io.joern:flatgraph-odb-convert_3": { "shasums": { - "jar": "9ba916f4cf9eecd93b56198479fc94d59638d08d84fb05f6c5eb8e968540077a", - "sources": "79afe55a3ac89f48698d429d565c37ad35865a788a7839e747d5bba73880e354" + "jar": "f117b9243b7a5febbb6270bb83e5fad6ee5b8a1dee61a1d84c97cb603d7962e3", + "sources": "c13a1dcbed9b5b13ee5b7a767a2138330e6cc3abcab952e4c081df7c0aed1fe2" }, - "version": "0.1.35" + "version": "0.1.36" }, "io.shiftleft:overflowdb-core_3": { "shasums": {