Skip to content

Commit 301c401

Browse files
max-leuthaeusermax-leuthaeuser
authored
Bump Scala to 3.9.0 and flatgraph to 0.1.36 (#1869)
- 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
1 parent 1735c28 commit 301c401

5 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎MODULE.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ bazel_dep(name = "rules_jvm_external", version = "7.0")
66
bazel_dep(name = "aspect_rules_lint", version = "2.5.2")
77
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.2")
88

9-
BAZEL_TOOLING_VERSION = "fbdfc66995360c408ecf94d34837a0355aa7ac4d"
9+
BAZEL_TOOLING_VERSION = "86bbf2be26dc7a2517a56c90e12fd9a6ed20dd25"
1010

1111
git_override(
1212
module_name = "bazel_tooling",
1313
commit = "{}".format(BAZEL_TOOLING_VERSION),
1414
remote = "git@github.com:joernio/bazel_tooling.git",
1515
)
1616

17-
bazel_dep(name = "rules_scala", version = "7.2.5")
17+
bazel_dep(name = "rules_scala", version = "7.3.0")
1818

1919
scala_config = use_extension(
2020
"@rules_scala//scala/extensions:config.bzl",
2121
"scala_config",
2222
)
2323
scala_config.settings(
24-
scala_version = "3.8.3",
24+
scala_version = "3.9.0",
2525
)
2626

2727
scala_deps = use_extension(
@@ -38,10 +38,10 @@ maven.install(
3838
name = "maven",
3939
artifacts = [
4040
"org.slf4j:slf4j-api:2.0.17",
41-
"io.joern:flatgraph-core_3:0.1.35",
42-
"io.joern:flatgraph-help_3:0.1.35",
43-
"io.joern:flatgraph-domain-classes-generator_3:0.1.35",
44-
"io.joern:flatgraph-odb-convert_3:0.1.35",
41+
"io.joern:flatgraph-core_3:0.1.36",
42+
"io.joern:flatgraph-help_3:0.1.36",
43+
"io.joern:flatgraph-domain-classes-generator_3:0.1.36",
44+
"io.joern:flatgraph-odb-convert_3:0.1.36",
4545
"net.sf.trove4j:core:3.1.0",
4646
"com.google.protobuf:protobuf-java:4.34.1",
4747
"com.lihaoyi:ujson_3:4.4.3",

‎MODULE.bazel.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bazel/scala.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@bazel_tooling//:scala_rule_factory.bzl", "make_scala_rules")
22

33
_rules = make_scala_rules(
4-
scala_version = "3.8.3",
4+
scala_version = "3.9.0",
55
common_scalacopts = [
66
"-java-output-version",
77
"17",

‎build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name := "codepropertygraph"
22

33
// parsed by project/Versions.scala, updated by updateDependencies.sh
4-
val flatgraphVersion = "0.1.35"
4+
val flatgraphVersion = "0.1.36"
55

66
inThisBuild(
77
List(
88
organization := "io.shiftleft",
9-
scalaVersion := "3.8.3",
9+
scalaVersion := "3.9.0",
1010
resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"),
1111
packageDoc / publishArtifact := true,
1212
packageSrc / publishArtifact := true,

‎maven_install.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"com.google.protobuf:protobuf-java": 1237026331,
1010
"com.lihaoyi:os-lib_3": 899915638,
1111
"com.lihaoyi:ujson_3": 1182647324,
12-
"io.joern:flatgraph-core_3": 1060140408,
13-
"io.joern:flatgraph-domain-classes-generator_3": -1894114436,
14-
"io.joern:flatgraph-help_3": -138228966,
15-
"io.joern:flatgraph-odb-convert_3": 1959782918,
12+
"io.joern:flatgraph-core_3": -747314055,
13+
"io.joern:flatgraph-domain-classes-generator_3": 593398397,
14+
"io.joern:flatgraph-help_3": -1945683429,
15+
"io.joern:flatgraph-odb-convert_3": 152328455,
1616
"net.sf.trove4j:core": 1808260229,
1717
"org.scala-lang:scala-library": 1230160761,
1818
"org.scala-lang:scala3-library_3": 1771369610,
@@ -53,14 +53,14 @@
5353
"com.typesafe:config:jar:sources": 1794326800,
5454
"io.get-coursier:interface": 1635041630,
5555
"io.get-coursier:interface:jar:sources": -37171318,
56-
"io.joern:flatgraph-core_3": 1182992137,
57-
"io.joern:flatgraph-core_3:jar:sources": 575284637,
58-
"io.joern:flatgraph-domain-classes-generator_3": 170340065,
59-
"io.joern:flatgraph-domain-classes-generator_3:jar:sources": -123490520,
60-
"io.joern:flatgraph-help_3": 1193217379,
61-
"io.joern:flatgraph-help_3:jar:sources": -1476209185,
62-
"io.joern:flatgraph-odb-convert_3": -1299461830,
63-
"io.joern:flatgraph-odb-convert_3:jar:sources": 1706697962,
56+
"io.joern:flatgraph-core_3": -589013217,
57+
"io.joern:flatgraph-core_3:jar:sources": 802498168,
58+
"io.joern:flatgraph-domain-classes-generator_3": 578529197,
59+
"io.joern:flatgraph-domain-classes-generator_3:jar:sources": 159333088,
60+
"io.joern:flatgraph-help_3": -335386351,
61+
"io.joern:flatgraph-help_3:jar:sources": -228043010,
62+
"io.joern:flatgraph-odb-convert_3": 378331389,
63+
"io.joern:flatgraph-odb-convert_3:jar:sources": 2066492454,
6464
"io.shiftleft:overflowdb-core_3": -1655377345,
6565
"io.shiftleft:overflowdb-core_3:jar:sources": 422126785,
6666
"net.oneandone.reflections8:reflections8": -362476393,
@@ -210,31 +210,31 @@
210210
},
211211
"io.joern:flatgraph-core_3": {
212212
"shasums": {
213-
"jar": "00437da45d6636049b316b5308c3e578b776680077e6d3bdad3c3df776c036b6",
214-
"sources": "72f6932954e33412d790a7b3737c428163110a2e99cf3f398f0c8865fe73a845"
213+
"jar": "e73417800e5e423aa149daa6a3ec7c81d48955d0dd38a3f24945c3e4661bf934",
214+
"sources": "492367dfeeb835ef75bcb69bcde32cb1140c303ca90ca0f73611e83cb6a499f3"
215215
},
216-
"version": "0.1.35"
216+
"version": "0.1.36"
217217
},
218218
"io.joern:flatgraph-domain-classes-generator_3": {
219219
"shasums": {
220-
"jar": "a64f8ea84a0ced62e3a4d5702ff87959bf0fb3cfe55d8856d82779d550d59d33",
221-
"sources": "81632035a3c029f0de74c7a477c24b576056c5573371ed95206ac6f6f8a30217"
220+
"jar": "c4bd96840601a7a9f671cf96637ccb69d61fb19a6ba2100187ff8666665e0de4",
221+
"sources": "7741a1000d357303fd7a306c99a5acafce20803790570333790cf8561ae0afe3"
222222
},
223-
"version": "0.1.35"
223+
"version": "0.1.36"
224224
},
225225
"io.joern:flatgraph-help_3": {
226226
"shasums": {
227-
"jar": "10bc62d8815dcfa333b3a48088c8f3301a4380c7d6691a9eed791f44a8df6dca",
228-
"sources": "8c7698fc70274487e265f61472154be0fee88a18cf24f05dc3cf11e998b4986b"
227+
"jar": "c6913df75b5d6b79215477617f599269aead9a8e2208a2a9e63d6533a462bde5",
228+
"sources": "dc1db6f9b6374dad68b1aca2458e90d4a672d335527360bc54bf2b149feaf352"
229229
},
230-
"version": "0.1.35"
230+
"version": "0.1.36"
231231
},
232232
"io.joern:flatgraph-odb-convert_3": {
233233
"shasums": {
234-
"jar": "9ba916f4cf9eecd93b56198479fc94d59638d08d84fb05f6c5eb8e968540077a",
235-
"sources": "79afe55a3ac89f48698d429d565c37ad35865a788a7839e747d5bba73880e354"
234+
"jar": "f117b9243b7a5febbb6270bb83e5fad6ee5b8a1dee61a1d84c97cb603d7962e3",
235+
"sources": "c13a1dcbed9b5b13ee5b7a767a2138330e6cc3abcab952e4c081df7c0aed1fe2"
236236
},
237-
"version": "0.1.35"
237+
"version": "0.1.36"
238238
},
239239
"io.shiftleft:overflowdb-core_3": {
240240
"shasums": {

0 commit comments

Comments
 (0)