Scala 3 migration (#270)

I tried to migrate code to scala 3. This required updates of some libs
and a little code adjustments.
I would appreciate your input 🙏

---------

Co-authored-by: Stephen Amar <[email protected]>
Co-authored-by: He-Pin(kerr) <[email protected]>

Author: 3 people

.github/workflows/pr-build.yaml

@@ -17,6 +17,7 @@ jobs:
     env:
       # Set LANG=C to simulate least-common-denominator target deployment environments:
       LANG: C
+      SCALANATIVE_THREAD_STACK_SIZE: 10m
     name: Sjsonnet build for ${{ matrix.lang }} on JDK ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -11,4 +11,4 @@ out/
 .bloop
 /project/.bloop
 /project/project/
-/project/metals.sbt
+/project/metals.sbt

bench/src/main/scala/sjsonnet/ParserBenchmark.scala

@@ -28,7 +28,7 @@ class ParserBenchmark {
   def main(bh: Blackhole): Unit = {
     bh.consume(allFiles.foreach { case (p, s) =>
       val res = fastparse.parse(s, new Parser(p, true, HashMap.empty, HashMap.empty).document(_))
-      bh.consume(res.asInstanceOf[Success[_]])
+      bh.consume(res.asInstanceOf[Success[?]])
     })
   }
 }

bench/src/main/scala/sjsonnet/ProfilingEvaluator.scala

@@ -96,8 +96,8 @@ class ProfilingEvaluator(resolver: CachedResolver,
         case a: Array[Expr.Bind] => a.iterator.flatMap(getChildren).toSeq
         case a: Array[Expr.Member.Field] => a.iterator.flatMap(getChildren).toSeq
         case a: Array[Expr.Member.AssertStmt] => a.iterator.flatMap(getChildren).toSeq
-        case s: Seq[_] => s.collect { case e: Expr => e }
-        case s: Some[_] => s.collect { case e: Expr => e }
+        case s: Seq[?] => s.collect { case e: Expr => e }
+        case s: Some[?] => s.collect { case e: Expr => e }
         case _ => Nil
       }.filter(_ != null).toSeq
     case _ => Nil

build.sbt

@@ -1,12 +1,25 @@
 val sjsonnetVersion = "0.4.15.1"
 
-scalaVersion in Global := "2.13.16"
+val scala213 = "2.13.16"
+val scala3 = "3.3.5"
 
 cancelable in Global := true
 
+val scala3Options = Seq()
+val scala2Options = Seq("-opt:l:inline", "-opt-inline-from:sjsonnet.*,sjsonnet.**", "-Xsource:3")
+
+lazy val commonSettings = Seq(
+  scalaVersion := scala3,
+  crossScalaVersions := Seq(scala213, scala3),
+  scalacOptions ++= {CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((3, _)) => scala3Options
+      case _ => scala2Options
+    }}
+)
+
 lazy val main = (project in file("sjsonnet"))
+  .settings(commonSettings: _*)
   .settings(
-    Compile / scalacOptions ++= Seq("-opt:l:inline", "-opt-inline-from:sjsonnet.*,sjsonnet.**"),
     Test / fork := true,
     Test / javaOptions += "-Xss100m",
     Test / baseDirectory := (ThisBuild / baseDirectory).value,
@@ -56,6 +69,7 @@ lazy val main = (project in file("sjsonnet"))
 lazy val bench = (project in file("bench"))
   .dependsOn(main % "compile->test")
   .enablePlugins(JmhPlugin)
+  .settings(commonSettings: _*)
   .settings(
     run / fork := true,
-  )
+  )

build.sc

@@ -5,7 +5,7 @@ import java.util.Base64
 
 val sjsonnetVersion = "0.4.15.1"
 
-val scalaVersions = Seq("2.12.20", "2.13.16")
+val scalaVersions = Seq("2.12.20", "2.13.16", "3.3.5")
 
 trait SjsonnetCrossModule extends CrossScalaModule with PublishModule {
   def crossValue: String
@@ -153,7 +153,7 @@ object sjsonnet extends Module {
       ivy"org.yaml:snakeyaml::2.0",
       ivy"com.google.re2j:re2j:1.8",
     )
-    def scalacOptions = Seq("-opt:l:inline", "-opt-inline-from:sjsonnet.*,sjsonnet.**")
+    def scalacOptions = Seq("-opt:l:inline", "-opt-inline-from:sjsonnet.*,sjsonnet.**", "-Xsource:3")
 
     object test extends ScalaTests with CrossTests {
       def forkArgs = Seq("-Xss100m")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.11

project/plugins.sbt

@@ -1,2 +1 @@
-//addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")

sjsonnet/server/src/sjsonnet/SjsonnetServerMain.scala

@@ -151,8 +151,9 @@ class Server[T](lockBase: String,
 
     @volatile var done = false
     @volatile var idle = false
-    val t = new Thread(() =>
-      try {
+    val t = new Thread(new Runnable{
+      override def run(): Unit = {
+        try {
         val (result, newStateCache) = sm.main0(
           args,
           sm.stateCache,
@@ -173,6 +174,8 @@ class Server[T](lockBase: String,
       } finally{
         done = true
         idle = true
+      }
+      }
       },
       "SjsonnetServerActionRunner"
     )

sjsonnet/src-jvm-native/sjsonnet/CachedResolvedFile.scala

@@ -26,7 +26,7 @@ class CachedResolvedFile(val resolvedImportPath: OsPath, memoryLimitBytes: Long,
   // Assert that the file is less than limit
   assert(jFile.length() <= memoryLimitBytes, s"Resolved import path $resolvedImportPath is too large: ${jFile.length()} bytes > ${memoryLimitBytes} bytes")
 
-  private[this] val resolvedImportContent: ResolvedFile = {
+  private val resolvedImportContent: ResolvedFile = {
     // TODO: Support caching binary data
     if (jFile.length() > cacheThresholdBytes) {
       // If the file is too large, then we will just read it from disk
@@ -38,11 +38,11 @@ class CachedResolvedFile(val resolvedImportPath: OsPath, memoryLimitBytes: Long,
     }
   }
 
-  private[this] def readString(jFile: File): String = {
+  private def readString(jFile: File): String = {
     new String(Files.readAllBytes(jFile.toPath), StandardCharsets.UTF_8);
   }
 
-  private[this] def readRawBytes(jFile: File): Array[Byte] = Files.readAllBytes(jFile.toPath)
+  private def readRawBytes(jFile: File): Array[Byte] = Files.readAllBytes(jFile.toPath)
 
   /**
    * A method that will return a reader for the resolved import. If the import is too large, then this will return
@@ -67,12 +67,12 @@ class CachedResolvedFile(val resolvedImportPath: OsPath, memoryLimitBytes: Long,
   }
 
 
-  override lazy val contentHash: String = {
+  override def contentHash(): String = {
     if (resolvedImportContent == null) {
       // If the file is too large, then we will just read it from disk
       Platform.hashFile(jFile)
     } else {
-      resolvedImportContent.contentHash
+      resolvedImportContent.contentHash()
     }
   }