Skip to content

Move to scala 3.8.3 and target JDK 17. #1863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ml86 merged 1 commit into from
Jul 22, 2026
Merged

Move to scala 3.8.3 and target JDK 17. #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ 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 = "a07fda4f8bc736081ad9921831bc9973e77e6e19"
BAZEL_TOOLING_VERSION = "4bcf42cc81b574b91699d696b504637677640871"

git_override(
module_name = "bazel_tooling",
commit = "{}".format(BAZEL_TOOLING_VERSION),
remote = "git@github.com:joernio/bazel_tooling.git",
)

bazel_dep(name = "rules_scala", version = "7.2.4")
bazel_dep(name = "rules_scala", version = "7.2.5")

scala_config = use_extension(
"@rules_scala//scala/extensions:config.bzl",
"scala_config",
)
scala_config.settings(
scala_version = "3.7.4",
scala_version = "3.8.3",
)

scala_deps = use_extension(
Expand All @@ -38,10 +38,10 @@ maven.install(
name = "maven",
artifacts = [
"org.slf4j:slf4j-api:2.0.17",
"io.joern:flatgraph-core_3:0.1.31",
"io.joern:flatgraph-help_3:0.1.31",
"io.joern:flatgraph-domain-classes-generator_3:0.1.31",
"io.joern:flatgraph-odb-convert_3:0.1.31",
"io.joern:flatgraph-core_3:0.1.34",
"io.joern:flatgraph-help_3:0.1.34",
"io.joern:flatgraph-domain-classes-generator_3:0.1.34",
"io.joern:flatgraph-odb-convert_3:0.1.34",
"net.sf.trove4j:core:3.1.0",
"com.google.protobuf:protobuf-java:4.34.1",
"org.json4s:json4s-native_3:4.0.3",
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bazel/java.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _rules = make_java_rules(
java_common_opts = [
"-g",
"--release",
"11",
"17",
"-Xlint:all",
"-Xlint:-cast",
"-XepDisableAllChecks",
Expand Down
2 changes: 1 addition & 1 deletion bazel/scala.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tooling//:scala_rule_factory.bzl", "make_scala_rules")

_rules = make_scala_rules(
scala_version = "3.7.4",
scala_version = "3.8.3",
common_scalacopts = [
"-java-output-version",
"17",
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name := "codepropertygraph"

// parsed by project/Versions.scala, updated by updateDependencies.sh
val flatgraphVersion = "0.1.32"
val flatgraphVersion = "0.1.34"

inThisBuild(
List(
organization := "io.shiftleft",
scalaVersion := "3.7.4",
scalaVersion := "3.8.3",
resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"),
packageDoc / publishArtifact := true,
packageSrc / publishArtifact := true,
Expand Down Expand Up @@ -56,7 +56,7 @@ lazy val codepropertygraph = Projects.codepropertygraph
lazy val schema2json = Projects.schema2json

ThisBuild / scalacOptions ++= Seq(
"-release", "8",
"-release", "17",
"-deprecation",
"-feature",
// "-explain",
Expand All @@ -70,7 +70,7 @@ ThisBuild / scalacOptions ++= Seq(

ThisBuild / javacOptions ++= Seq(
"-g", // debug symbols
"--release", "8"
"--release", "17"
)

Global / onChangedBuildSource := ReloadOnSourceChanges
Expand Down
8 changes: 4 additions & 4 deletions ...nerated/io/shiftleft/codepropertygraph/generated/traversals/TraversalAnnotationBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class TraversalAnnotationBase[NodeType <: nodes.AnnotationBase](val traver
*/
def fullNameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 21, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -44,7 +44,7 @@ final class TraversalAnnotationBase[NodeType <: nodes.AnnotationBase](val traver
if (values.length == 1) return fullNameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 21, value)
Expand Down Expand Up @@ -99,7 +99,7 @@ final class TraversalAnnotationBase[NodeType <: nodes.AnnotationBase](val traver
*/
def nameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -112,7 +112,7 @@ final class TraversalAnnotationBase[NodeType <: nodes.AnnotationBase](val traver
if (values.length == 1) return nameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
Expand Down
4 changes: 2 additions & 2 deletions .../io/shiftleft/codepropertygraph/generated/traversals/TraversalAnnotationliteralBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class TraversalAnnotationliteralBase[NodeType <: nodes.AnnotationLiteralBa
*/
def nameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -44,7 +44,7 @@ final class TraversalAnnotationliteralBase[NodeType <: nodes.AnnotationLiteralBa
if (values.length == 1) return nameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
Expand Down
4 changes: 2 additions & 2 deletions .../generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalAstnodeBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class TraversalAstnodeBase[NodeType <: nodes.AstNodeBase](val traversal: I
*/
def codeExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 8, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -43,7 +43,7 @@ final class TraversalAstnodeBase[NodeType <: nodes.AstNodeBase](val traversal: I
if (values.length == 1) return codeExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 8, value)
Expand Down
12 changes: 6 additions & 6 deletions .../generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalBindingBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
*/
def methodFullNameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 37, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -43,7 +43,7 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
if (values.length == 1) return methodFullNameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 37, value)
Expand Down Expand Up @@ -98,7 +98,7 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
*/
def nameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -111,7 +111,7 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
if (values.length == 1) return nameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
Expand Down Expand Up @@ -166,7 +166,7 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
*/
def signatureExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 47, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -179,7 +179,7 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
if (values.length == 1) return signatureExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 47, value)
Expand Down
4 changes: 2 additions & 2 deletions ...in/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalBlockBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ final class TraversalBlockBase[NodeType <: nodes.BlockBase](val traversal: Itera
*/
def typeFullNameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 50, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -51,7 +51,7 @@ final class TraversalBlockBase[NodeType <: nodes.BlockBase](val traversal: Itera
if (values.length == 1) return typeFullNameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 50, value)
Expand Down
14 changes: 7 additions & 7 deletions ...ain/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalCallBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
*/
def dispatchTypeExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 15, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -43,7 +43,7 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
if (values.length == 1) return dispatchTypeExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 15, value)
Expand Down Expand Up @@ -102,7 +102,7 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
*/
def methodFullNameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 37, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -115,7 +115,7 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
if (values.length == 1) return methodFullNameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 37, value)
Expand Down Expand Up @@ -179,7 +179,7 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
*/
def staticReceiverExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 48, value)
.asInstanceOf[Iterator[NodeType]]
Expand Down Expand Up @@ -247,7 +247,7 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
*/
def typeFullNameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 50, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -260,7 +260,7 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
if (values.length == 1) return typeFullNameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 50, value)
Expand Down
8 changes: 4 additions & 4 deletions ...generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalCallreprBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class TraversalCallreprBase[NodeType <: nodes.CallReprBase](val traversal:
*/
def nameExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -43,7 +43,7 @@ final class TraversalCallreprBase[NodeType <: nodes.CallReprBase](val traversal:
if (values.length == 1) return nameExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 39, value)
Expand Down Expand Up @@ -98,7 +98,7 @@ final class TraversalCallreprBase[NodeType <: nodes.CallReprBase](val traversal:
*/
def signatureExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 47, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -111,7 +111,7 @@ final class TraversalCallreprBase[NodeType <: nodes.CallReprBase](val traversal:
if (values.length == 1) return signatureExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 47, value)
Expand Down
6 changes: 3 additions & 3 deletions ...ted/io/shiftleft/codepropertygraph/generated/traversals/TraversalClosurebindingBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ final class TraversalClosurebindingBase[NodeType <: nodes.ClosureBindingBase](va
*/
def closureBindingIdExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 7, value)
.asInstanceOf[Iterator[NodeType]]
Expand Down Expand Up @@ -104,7 +104,7 @@ final class TraversalClosurebindingBase[NodeType <: nodes.ClosureBindingBase](va
*/
def evaluationStrategyExact(value: String): Iterator[NodeType] = traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 17, value)
.asInstanceOf[Iterator[NodeType]]
Expand All @@ -117,7 +117,7 @@ final class TraversalClosurebindingBase[NodeType <: nodes.ClosureBindingBase](va
if (values.length == 1) return evaluationStrategyExact(values.head)
traversal match {
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
val someNode = init.next
val someNode = init.next()
values.iterator.flatMap { value =>
flatgraph.Accessors
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 17, value)
Expand Down
Loading
Loading