Harmonize scalac flags and enable Xlint/Werror (#352)

Fixes #341 and #298

Author: stephenamar-db

bench/src/main/scala/sjsonnet/MainBenchmark.scala

@@ -18,7 +18,7 @@ object MainBenchmark {
 
   def findFiles(): (IndexedSeq[(Path, String)], EvalScope) = {
     val parser = mainargs.ParserForClass[Config]
-    val config = parser.constructEither(MainBenchmark.mainArgs, autoPrintHelpAndExit = None).getOrElse(???)
+    val config = parser.constructEither(MainBenchmark.mainArgs.toIndexedSeq, autoPrintHelpAndExit = None).getOrElse(???)
     val file = config.file
     val wd = os.pwd
     val path = OsPath(os.Path(file, wd))

bench/src/main/scala/sjsonnet/MaterializerBenchmark.scala

@@ -22,7 +22,7 @@ class MaterializerBenchmark {
   @Setup
   def setup(): Unit = {
     val parser = mainargs.ParserForClass[Config]
-    val config = parser.constructEither(MainBenchmark.mainArgs, autoPrintHelpAndExit = None).getOrElse(???)
+    val config = parser.constructEither(MainBenchmark.mainArgs.toIndexedSeq, autoPrintHelpAndExit = None).getOrElse(???)
     val file = config.file
     val wd = os.pwd
     val path = os.Path(file, wd)
@@ -31,7 +31,7 @@ class MaterializerBenchmark {
       Map.empty[String, String],
       Map.empty[String, String],
       OsPath(wd),
-      importer = SjsonnetMain.resolveImport(config.jpaths.map(os.Path(_, wd)).map(OsPath(_)), None),
+      importer = SjsonnetMain.resolveImport(config.jpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq, None),
       parseCache = new DefaultParseCache
     )
     value = interp.evaluate(os.read(path), OsPath(path)).getOrElse(???)

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

@@ -5,12 +5,12 @@ import scala.collection.compat.*
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.*
 
-class ProfilingEvaluator(resolver: CachedResolver,
-                         extVars: String => Option[Expr],
-                         wd: Path,
-                         settings: Settings,
-                         warn: Error => Unit)
-  extends Evaluator(resolver, extVars, wd, settings, warn) {
+class ProfilingEvaluator(r: CachedResolver,
+                         e: String => Option[Expr],
+                         w: Path,
+                         s: Settings,
+                         wa: Error => Unit)
+  extends Evaluator(r, e, w, s, wa) {
 
   trait Box {
     def name: String

bench/src/main/scala/sjsonnet/RunProfiler.scala

@@ -4,7 +4,7 @@ import java.io.StringWriter
 
 object RunProfiler extends App {
   val parser = mainargs.ParserForClass[Config]
-  val config = parser.constructEither(MainBenchmark.mainArgs, autoPrintHelpAndExit = None).getOrElse(???)
+  val config = parser.constructEither(MainBenchmark.mainArgs.toIndexedSeq, autoPrintHelpAndExit = None).getOrElse(???)
   val file = config.file
   val wd = os.pwd
   val path = OsPath(os.Path(file, wd))
@@ -13,7 +13,7 @@ object RunProfiler extends App {
     Map.empty[String, String],
     Map.empty[String, String],
     OsPath(wd),
-    importer = SjsonnetMain.resolveImport(config.jpaths.map(os.Path(_, wd)).map(OsPath(_)), None),
+    importer = SjsonnetMain.resolveImport(config.jpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq, None),
     parseCache = parseCache
   ) {
     override def createEvaluator(resolver: CachedResolver, extVars: String => Option[Expr], wd: Path,

build.sbt

@@ -5,15 +5,21 @@ 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")
+val commonOptions = Seq("-deprecation", "-Werror")
+val scala3Options = Seq("-Wconf:origin=scala.collection.compat.*:s", "-Xlint:all")
+val scala213Options = Seq(
+  "-opt:l:inline",
+  "-opt-inline-from:sjsonnet.*,sjsonnet.**",
+  "-Xsource:3",
+  "-Xlint:_",
+  "-Wconf:origin=scala.collection.compat.*:s")
 
 lazy val commonSettings = Seq(
   scalaVersion := scala3,
   crossScalaVersions := Seq(scala213, scala3),
-  scalacOptions ++= {CrossVersion.partialVersion(scalaVersion.value) match {
+  scalacOptions ++= commonOptions ++ {CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) => scala3Options
-      case _ => scala2Options
+      case _ => scala213Options
     }}
 )
 

build.sc

@@ -44,6 +44,16 @@ trait SjsonnetCrossModule extends CrossScalaModule with PublishModule {
       Developer("lihaoyi", "Li Haoyi","https://github.com/lihaoyi")
     )
   )
+  def scalacOptions = Seq("-deprecation", "-Werror") ++ (
+    if (!ZincWorkerUtil.isScala3(scalaVersion())) Seq(
+      "-opt:l:inline",
+      "-opt-inline-from:sjsonnet.*,sjsonnet.**",
+      "-Xsource:3",
+      "-Xlint:_") ++ (
+        if (scalaVersion() startsWith "2.13") Seq("-Wconf:origin=scala.collection.compat.*:s")
+        else Seq("-Xfatal-warnings", "-Ywarn-unused:-nowarn"))
+    else Seq[String]("-Wconf:origin=scala.collection.compat.*:s", "-Xlint:all")
+  )
   trait CrossTests extends ScalaModule with TestModule.Utest {
     def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.5")
   }
@@ -69,11 +79,6 @@ object sjsonnet extends Module {
     )
     object test extends ScalaJSTests with CrossTests {
       def jsEnvConfig = JsEnvConfig.NodeJs(args=List("--stack-size=" + stackSizekBytes))
-      def sources = T.sources(
-        this.millSourcePath / "src",
-        this.millSourcePath / "src-js",
-        this.millSourcePath / "src-jvm-js"
-      )
       def generatedSources = T{
         val files = os.walk(this.millSourcePath / "resources").filterNot(os.isDir).map(p => p.relativeTo(this.millSourcePath / "resources") -> os.read.bytes(p)).toMap
         os.write(
@@ -133,13 +138,7 @@ object sjsonnet extends Module {
       def forkEnv = Map(
         "SCALANATIVE_THREAD_STACK_SIZE" -> stackSize,
       )
-      def scalaNativeVersion = SjsonnetNativeModule.this.scalaNativeVersion
       def nativeLTO = LTO.None
-      def sources = T.sources(
-        this.millSourcePath / "src",
-        this.millSourcePath / "src-native",
-        this.millSourcePath / "src-jvm-native"
-      )
     }
   }
 
@@ -159,18 +158,9 @@ object sjsonnet extends Module {
       ivy"org.yaml:snakeyaml::2.0",
       ivy"com.google.re2j:re2j:1.8",
     )
-    def scalacOptions = super.scalacOptions() ++ (
-      if (!ZincWorkerUtil.isScala3(scalaVersion())) Seq("-opt:l:inline", "-opt-inline-from:sjsonnet.*,sjsonnet.**", "-Xsource:3")
-      else Seq[String]()
-    )
 
     object test extends ScalaTests with CrossTests {
       def forkArgs = Seq("-Xss" + stackSize)
-      def sources = T.sources(
-        this.millSourcePath / "src",
-        this.millSourcePath / "src-jvm",
-        this.millSourcePath / "src-jvm-native"
-      )
     }
 
     object client extends JavaModule {

sjsonnet/src-js/java/util/BitSet.scala

@@ -3,7 +3,6 @@ package java.util
 import java.util.stream.IntStream
 
 import scala.collection.mutable.{BitSet => SBitSet}
-import scala.collection.JavaConverters._
 
 class BitSet(_initialSizeDummy: Int) extends java.lang.Cloneable {
   val bs: SBitSet = SBitSet.empty

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

@@ -22,7 +22,7 @@ object SjsonnetMain {
         .find(os.exists)
         .flatMap(p => try Some(OsPath(p)) catch{case NonFatal(_) => None})
 
-    def read(path: Path, binaryData: Boolean = false): Option[ResolvedFile] = {
+    def read(path: Path, binaryData: Boolean): Option[ResolvedFile] = {
       readPath(path, binaryData)
     }
   }
@@ -61,7 +61,7 @@ object SjsonnetMain {
     val doc = "usage: sjsonnet  [sjsonnet-options] script-file"
     val result = for{
       config <- parser.constructEither(
-        args,
+        args.toIndexedSeq,
         allowRepeats = true,
         customName = name, customDoc = doc,
         autoPrintHelpAndExit = None
@@ -144,9 +144,10 @@ object SjsonnetMain {
                             codeFiles: Seq[String],
                             wd: os.Path) = {
 
-    def split(s: String) = s.split("=", 2) match{
+    def split(s: String) = s.split("=", 2) match {
       case Array(x) => (x, System.getenv(x))
       case Array(x, v) => (x, v)
+      case _ => ???
     }
 
     def splitMap(s: Seq[String], f: String => String) = s.map(split).map{case (x, v) => (x, f(v))}
@@ -167,10 +168,10 @@ object SjsonnetMain {
                              config: Config,
                              parseCache: ParseCache,
                              wd: os.Path,
-                             allowedInputs: Option[Set[os.Path]] = None,
-                             importer: Option[(Path, String) => Option[os.Path]] = None,
-                             warnLogger: String => Unit = null,
-                             std: Val.Obj = new Std().Std): Either[String, String] = {
+                             allowedInputs: Option[Set[os.Path]],
+                             importer: Option[(Path, String) => Option[os.Path]],
+                             warnLogger: String => Unit,
+                             std: Val.Obj): Either[String, String] = {
 
     val (jsonnetCode, path) =
       if (config.exec.value) (file, wd / Util.wrapInLessThanGreaterThan("exec"))

sjsonnet/src-native/java/util/BitSet.scala

@@ -3,7 +3,6 @@ package java.util
 import java.util.stream.IntStream
 
 import scala.collection.mutable.{BitSet => SBitSet}
-import scala.collection.JavaConverters._
 
 class BitSet(_initialSizeDummy: Int) extends java.lang.Cloneable {
   val bs: SBitSet = SBitSet.empty

sjsonnet/src/sjsonnet/DecimalFormat.scala

@@ -22,7 +22,7 @@ object DecimalFormat {
   def leftPad(n: Long, targetWidth: Int): String = {
     val sign = if (n < 0) "-" else ""
     val absN = math.abs(n)
-    val nWidth = if (absN == 0) 1 else Math.log10(absN).toInt + 1
+    val nWidth = if (absN == 0) 1 else Math.log10(absN.toDouble).toInt + 1
     sign + "0" * (targetWidth - nWidth) + absN
   }
   def rightPad(n0: Long, minWidth: Int, maxWidth: Int): String = {
@@ -39,13 +39,13 @@ object DecimalFormat {
       case Some(expLength) =>
         val roundLog10 = Math.ceil(Math.log10(Math.abs(number))).toLong
         val expNum = roundLog10 - 1
-        val scaled = number / math.pow(10, expNum)
+        val scaled = number / math.pow(10, expNum.toDouble)
         val prefix = scaled.toLong.toString
         val expFrag = leftPad(expNum, expLength)
         val fracFrag = fracLengthOpt.map{case (zeroes, hashes) =>
           if (zeroes == 0 && hashes == 0) ""
           else {
-            val divided = number / Math.pow(10, expNum - zeroes - hashes)
+            val divided = number / Math.pow(10, (expNum - zeroes - hashes).toDouble)
             val scaledFrac = divided % Math.pow(10, zeroes + hashes)
             rightPad(Math.abs(Math.round(scaledFrac)), zeroes, zeroes + hashes)
           }