Skip to content
Merged
Changes from 1 commit
Commits
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
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "flatgraph"
ThisBuild / organization := "io.joern"
ThisBuild / scalaVersion := scala3

val scala3 = "3.3.7"
val scala3 = "3.7.4"
// ^ n.b. should always be the current scala LTS release, see

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per the line right below this: let's not do this

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I instead bumped to 3.3.8

that supposedly can also fix the sun.misc.Unsafe from lazy-val initialization warnings.

I don't quite understand whether that needs an additional compiler switch? https://github.com/scala/scala3/releases/tag/3.3.8 suggests that this needs some -Y..., but the referenced PR
scala/scala3-lts#637 suggests that this works automatically when targeting newer jdks?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the way I read the PR, it was initially proposed to work automatically. But reviewers felt that went too far for a LTS dot release and so the compiler option is required.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

downstream (joern et al.) will upgrade to 3.8, so this is fine

// https://www.scala-lang.org/blog/2022/08/17/long-term-compatibility-plans.html#library-maintainers
val scala2_12 = "2.12.20"
Expand Down Expand Up @@ -33,7 +33,7 @@ lazy val core = project
name := "flatgraph-core",
libraryDependencies ++= Seq(
"com.lihaoyi" %% "ujson" % "4.1.0",
"com.github.luben" % "zstd-jni" % "1.5.7-2",
"com.github.luben" % "zstd-jni" % "1.5.7-11",
"org.slf4j" % "slf4j-api" % slf4jVersion,
)
)
Expand Down Expand Up @@ -208,7 +208,7 @@ ThisBuild / libraryDependencies ++= Seq(
ThisBuild / scalacOptions ++= Seq(
"-deprecation",
"-feature",
"--release", "8",
"--release", "11",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this change still required then? same at the bottom? i mean, doesn't really matter I guess...

"-language:implicitConversions",
"-no-indent", // Require classical {...} syntax, indentation is not significant.
"-old-syntax" // Require `(...)` around conditions.
Expand All @@ -222,7 +222,7 @@ val scalacOptionsFor2_12 = Seq(

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

Global / cancelable := true
Expand Down
Loading