Reapply "Upgrade Scala 3 to 3.3.8 with -Yfuture-lazy-vals (#920)" (#936) (#1037)

This reverts commit 91c0d75.

Author: stephenamar-db

build.mill

@@ -22,7 +22,7 @@ import mill.api.BuildCtx
 
 import java.util.Base64
 
-val scalaVersions: Seq[String] = Seq("3.3.7", "2.13.18")
+val scalaVersions: Seq[String] = Seq("3.3.8", "2.13.18")
 val jvmScalaVersions: Seq[String] = scalaVersions ++ Seq("2.12.21")
 val stackSize = "100m"
 val stackSizekBytes = 100 * 1024
@@ -85,7 +85,10 @@ trait SjsonnetCrossModule extends CrossScalaModule with ScalafmtModule {
       ) ++ (if (scalaVersion().startsWith("2.13"))
               Seq("-Wopt", "-Wconf:origin=scala.collection.compat.*:s")
             else Seq("-Xfatal-warnings", "-Ywarn-unused:-nowarn"))
-    else Seq[String]("-Wconf:origin=scala.collection.compat.*:s", "-Xlint:all")
+    else Seq[String](
+      "-Wconf:origin=scala.collection.compat.*:s",
+      "-Xlint:all"
+    )
   )
   def scalaDocOptions =
     super.scalaDocOptions().filterNot(o => o == "-Werror" || o == "-Xfatal-warnings")
@@ -375,7 +378,8 @@ object sjsonnet extends VersionFileModule {
     def forkArgs =
       Seq("-Xss" + stackSize, "--enable-native-access=ALL-UNNAMED")
 
-    def scalacOptions = super.scalacOptions() ++ Seq("-release", "17")
+    def scalacOptions = super.scalacOptions() ++ Seq("-release", "17") ++
+      (if (JvmWorkerUtil.isScala3(scalaVersion())) Seq("-Yfuture-lazy-vals") else Seq.empty)
     def javacOptions = super.javacOptions() ++ Seq("--release", "17")
 
     def mvnDeps = super.mvnDeps() ++ Seq(
@@ -400,7 +404,8 @@ object sjsonnet extends VersionFileModule {
       def artifactName = "sjsonnet-server"
       def scalaVersion = SjsonnnetJvmModule.this.crossValue
       def moduleDeps = Seq(SjsonnnetJvmModule.this, client)
-      def scalacOptions = super.scalacOptions() ++ Seq("-release", "17", "-deprecation", "-Werror")
+      def scalacOptions = super.scalacOptions() ++ Seq("-release", "17", "-deprecation", "-Werror") ++
+        (if (JvmWorkerUtil.isScala3(scalaVersion())) Seq("-Yfuture-lazy-vals") else Seq.empty)
       def javacOptions = super.javacOptions() ++ Seq("--release", "17")
 
       override def prependShellScript = mill.util.Jvm.universalScript(

build.sbt

@@ -1,10 +1,10 @@
 val sjsonnetVersion = IO.readLines(new File("sjsonnet/version")).head.trim
 cancelable in Global := true
 
-val options = Seq("-Wconf:origin=scala.collection.compat.*:s", "-Xlint:all", "-release", "17")
+val options = Seq("-Wconf:origin=scala.collection.compat.*:s", "-Xlint:all", "-release", "17", "-Yfuture-lazy-vals")
 
 lazy val commonSettings = Seq(
-  scalaVersion := "3.3.7",
+  scalaVersion := "3.3.8",
   scalacOptions ++= options,
   javacOptions ++= Seq("--release", "17")
 )
@@ -21,7 +21,7 @@ lazy val main = (project in file("sjsonnet"))
     libraryDependencies ++= Seq(
       "com.lihaoyi" %% "fastparse" % "3.1.1",
       "com.lihaoyi" %% "pprint" % "0.9.6",
-      "com.lihaoyi" %% "ujson" % "4.4.2",
+      "com.lihaoyi" %% "ujson" % "4.4.3",
       "com.lihaoyi" %% "scalatags" % "0.13.1",
       "com.lihaoyi" %% "os-lib" % "0.11.8",
       "com.lihaoyi" %% "mainargs" % "0.7.8",