Merge pull request #1367 from alexarchambault/config-module

Split config db stuff to a separate config module

Author: alexarchambault

build.sc

@@ -42,6 +42,7 @@ object cli extends Cli
 
 object `cli-options`  extends CliOptions
 object `build-macros` extends BuildMacros
+object config         extends Cross[Config](Scala.all: _*)
 object options        extends Options
 object scalaparse     extends ScalaParse
 object directives     extends Directives
@@ -157,10 +158,6 @@ trait BuildMacros extends ScalaCliSbtModule
     with ScalaCliScalafixModule
     with HasTests {
   def scalaVersion = Scala.defaultInternal
-  def scalacOptions = T {
-    super.scalacOptions() ++
-      (if (scalaVersion().startsWith("2.")) Seq("-Ywarn-unused") else Nil)
-  }
   def compileIvyDeps = T {
     if (scalaVersion().startsWith("3"))
       super.compileIvyDeps()
@@ -400,7 +397,7 @@ trait Directives extends ScalaCliSbtModule with ScalaCliPublishModule with HasTe
   def ivyDeps = super.ivyDeps() ++ Agg(
     // Deps.asm,
     Deps.bloopConfig,
-    Deps.jsoniterCore,
+    Deps.jsoniterCore213,
     Deps.pprint,
     Deps.scalametaTrees,
     Deps.scalaparse,
@@ -440,6 +437,29 @@ trait Directives extends ScalaCliSbtModule with ScalaCliPublishModule with HasTe
   }
 }
 
+class Config(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
+    with ScalaCliPublishModule
+    with ScalaCliScalafixModule {
+  def ivyDeps = {
+    val maybeCollectionCompat =
+      if (crossScalaVersion.startsWith("2.12.")) Seq(Deps.collectionCompat)
+      else Nil
+    super.ivyDeps() ++ maybeCollectionCompat ++ Agg(
+      Deps.jsoniterCore
+    )
+  }
+  def compileIvyDeps = super.compileIvyDeps() ++ Agg(
+    Deps.jsoniterMacros
+  )
+
+  // Disabling Scalafix in 2.13 and 3, so that it doesn't remove
+  // some compatibility-related imports, that are actually only used
+  // in Scala 2.12.
+  def fix(args: String*) =
+    if (crossScalaVersion.startsWith("2.12.")) super.fix(args: _*)
+    else T.command(())
+}
+
 trait Options extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
     with ScalaCliScalafixModule {
   def scalaVersion = Scala.defaultInternal
@@ -497,10 +517,6 @@ class Scala3Graal(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
     )
     super.resources() ++ Seq(mill.PathRef(extraResourceDir))
   }
-  def scalacOptions = T {
-    super.scalacOptions() ++
-      (if (scalaVersion().startsWith("2.")) Seq("-Ywarn-unused") else Nil)
-  }
 }
 
 trait Scala3GraalProcessor extends ScalaModule with ScalaCliPublishModule {
@@ -534,7 +550,7 @@ trait Build extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
     Deps.asm,
     Deps.collectionCompat,
     Deps.javaClassName,
-    Deps.jsoniterCore,
+    Deps.jsoniterCore213,
     Deps.nativeTestRunner,
     Deps.osLib,
     Deps.pprint,
@@ -582,7 +598,7 @@ trait Build extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
 trait CliOptions extends SbtModule with ScalaCliPublishModule with ScalaCliCompile {
   def ivyDeps = super.ivyDeps() ++ Agg(
     Deps.caseApp,
-    Deps.jsoniterCore,
+    Deps.jsoniterCore213,
     Deps.osLib,
     Deps.signingCliOptions
   )
@@ -651,15 +667,15 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
   def scalaVersion = T(myScalaVersion)
 
   def scalacOptions = T {
-    super.scalacOptions() ++ asyncScalacOptions(scalaVersion()) ++
-      (if (scalaVersion().startsWith("2.")) Seq("-Ywarn-unused") else Nil)
+    super.scalacOptions() ++ asyncScalacOptions(scalaVersion())
   }
   def javacOptions = T {
     super.javacOptions() ++ Seq("--release", "16")
   }
   def moduleDeps = Seq(
     `build-module`,
     `cli-options`,
+    config(Scala.scala3),
     `scala3-graal`(Scala.scala3)
   )
 
@@ -671,7 +687,7 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
     Deps.coursierPublish,
     Deps.jimfs, // scalaJsEnvNodeJs pulls jimfs:1.1, whose class path seems borked (bin compat issue with the guava version it depends on)
     Deps.jniUtils,
-    Deps.jsoniterCore,
+    Deps.jsoniterCore213,
     Deps.libsodiumjni,
     Deps.metaconfigTypesafe,
     Deps.pythonNativeLibs,
@@ -724,7 +740,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
     PathRef(T.dest / "working-dir")
   }
   def scalacOptions = T {
-    super.scalacOptions() ++ Seq("-Xasync", "-Ywarn-unused", "-deprecation")
+    super.scalacOptions() ++ Seq("-Xasync", "-deprecation")
   }
 
   def modulesPath = T {
@@ -752,7 +768,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
       Deps.coursier
         .exclude(("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-macros")),
       Deps.dockerClient,
-      Deps.jsoniterCore,
+      Deps.jsoniterCore213,
       Deps.libsodiumjni,
       Deps.pprint,
       Deps.scalaAsync,
@@ -939,11 +955,7 @@ class Runner(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
     with ScalaCliPublishModule
     with ScalaCliScalafixModule {
   def scalacOptions = T {
-    super.scalacOptions() ++ {
-      if (scalaVersion().startsWith("2.")) Seq("-Ywarn-unused")
-      else Nil
-    } ++ Seq("-release", "8")
-
+    super.scalacOptions() ++ Seq("-release", "8")
   }
   def mainClass = Some("scala.cli.runner.Runner")
   def sources = T.sources {
@@ -965,10 +977,7 @@ class TestRunner(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
     with ScalaCliPublishModule
     with ScalaCliScalafixModule {
   def scalacOptions = T {
-    super.scalacOptions() ++ {
-      if (scalaVersion().startsWith("2.")) Seq("-Ywarn-unused", "-deprecation")
-      else Nil
-    } ++ Seq("-release", "8")
+    super.scalacOptions() ++ Seq("-release", "8")
   }
   def ivyDeps = super.ivyDeps() ++ Agg(
     Deps.asm,
@@ -983,9 +992,7 @@ class BloopRifle(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
     with HasTests
     with ScalaCliScalafixModule {
   def scalacOptions = T {
-    super.scalacOptions() ++
-      (if (scalaVersion().startsWith("2.")) Seq("-Ywarn-unused") else Nil) ++
-      Seq("-deprecation")
+    super.scalacOptions() ++ Seq("-deprecation")
   }
   def ivyDeps = super.ivyDeps() ++ Agg(
     Deps.bsp4j,
@@ -1023,12 +1030,6 @@ class BloopRifle(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
 class TastyLib(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
     with ScalaCliPublishModule
     with ScalaCliScalafixModule {
-  def scalacOptions = T(
-    super.scalacOptions() ++ {
-      if (scalaVersion().startsWith("2.")) Seq("-Ywarn-unused")
-      else Nil
-    }
-  )
   def constantsFile = T.persistent {
     val dir  = T.dest / "constants"
     val dest = dir / "Constants.scala"

modules/build/src/main/scala/scala/build/Directories.scala

@@ -15,10 +15,16 @@ trait Directories {
   def bloopWorkingDir: os.Path
   def secretsDir: os.Path
   def cacheDir: os.Path
+
+  final def dbPath: os.Path =
+    secretsDir / Directories.defaultDbFileName
 }
 
 object Directories {
 
+  def defaultDbFileName: String =
+    "config.json"
+
   final case class OsLocations(projDirs: ProjectDirectories) extends Directories {
     lazy val localRepoDir: os.Path =
       os.Path(projDirs.cacheDir, Os.pwd) / "local-repo"

modules/cli/src/main/scala/scala/cli/commands/Bsp.scala

@@ -10,6 +10,7 @@ import scala.build.internal.CustomCodeWrapper
 import scala.build.options.BuildOptions
 import scala.build.{Build, CrossSources, Inputs, PersistentDiagnosticLogger, Sources}
 import scala.cli.CurrentParams
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.util.CommonOps._
 import scala.cli.commands.util.SharedOptionsUtil._
 import scala.cli.config.{ConfigDb, Keys}
@@ -70,8 +71,7 @@ object Bsp extends ScalaCommand[BspOptions] {
     val logger = getSharedOptions().logging.logger
     val inputs = argsToInputs(args.all).orExit(logger)
     CurrentParams.workspaceOpt = Some(inputs.workspace)
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val configDb = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

modules/cli/src/main/scala/scala/cli/commands/Compile.scala

@@ -7,6 +7,7 @@ import java.io.File
 import scala.build.options.Scope
 import scala.build.{Build, BuildThreads, Builds, Os}
 import scala.cli.CurrentParams
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.util.BuildCommandHelpers
 import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
 import scala.cli.commands.util.SharedOptionsUtil._
@@ -77,8 +78,7 @@ object Compile extends ScalaCommand[CompileOptions] with BuildCommandHelpers {
     val threads      = BuildThreads.create()
 
     val compilerMaker = options.shared.compilerMaker(threads).orExit(logger)
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val configDb      = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

modules/cli/src/main/scala/scala/cli/commands/Doc.scala

@@ -12,6 +12,7 @@ import scala.build.errors.BuildException
 import scala.build.interactive.InteractiveFileOps
 import scala.build.internal.Runner
 import scala.cli.CurrentParams
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
 import scala.cli.commands.util.SharedOptionsUtil._
 import scala.cli.config.{ConfigDb, Keys}
@@ -35,8 +36,7 @@ object Doc extends ScalaCommand[DocOptions] {
     val compilerMaker       = ScalaCompilerMaker.IgnoreScala2(maker)
     val docCompilerMakerOpt = Some(SimpleScalaCompilerMaker("java", Nil, scaladoc = true))
 
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val configDb = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

modules/cli/src/main/scala/scala/cli/commands/Metabrowse.scala

@@ -8,6 +8,7 @@ import java.io.File
 import scala.build.internal.{Constants, ExternalBinaryParams, FetchExternalBinary, Runner}
 import scala.build.{Build, BuildThreads, Logger}
 import scala.cli.CurrentParams
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
 import scala.cli.commands.util.SharedOptionsUtil._
 import scala.cli.config.{ConfigDb, Keys}
@@ -58,8 +59,7 @@ object Metabrowse extends ScalaCommand[MetabrowseOptions] {
     val threads = BuildThreads.create()
 
     val compilerMaker = options.shared.compilerMaker(threads).orExit(logger)
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val configDb      = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

modules/cli/src/main/scala/scala/cli/commands/Package.scala

@@ -29,6 +29,7 @@ import scala.cli.CurrentParams
 import scala.cli.commands.OptionsHelper.*
 import scala.cli.commands.Run.orPythonDetectionError
 import scala.cli.commands.packaging.Spark
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.util.BuildCommandHelpers
 import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
 import scala.cli.commands.util.MainClassOptionsUtil.*
@@ -61,9 +62,8 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
     val compilerMaker       = options.compilerMaker(threads).orExit(logger)
     val docCompilerMakerOpt = options.docCompilerMakerOpt
 
-    val cross = options.compileCross.cross.getOrElse(false)
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val cross    = options.compileCross.cross.getOrElse(false)
+    val configDb = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

modules/cli/src/main/scala/scala/cli/commands/Repl.scala

@@ -11,6 +11,7 @@ import scala.build.internal.Runner
 import scala.build.options.{BuildOptions, JavaOpt, Scope}
 import scala.cli.CurrentParams
 import scala.cli.commands.Run.maybePrintSimpleScalacOutput
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.util.CommonOps._
 import scala.cli.commands.util.SharedOptionsUtil._
 import scala.cli.config.{ConfigDb, Keys}
@@ -117,9 +118,8 @@ object Repl extends ScalaCommand[ReplOptions] {
       }
     }
 
-    val cross = options.sharedRepl.compileCross.cross.getOrElse(false)
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val cross    = options.sharedRepl.compileCross.cross.getOrElse(false)
+    val configDb = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

modules/cli/src/main/scala/scala/cli/commands/Run.scala

@@ -12,6 +12,7 @@ import scala.build.errors.BuildException
 import scala.build.internal.{Constants, Runner, ScalaJsLinkerConfig}
 import scala.build.options.{BuildOptions, JavaOpt, Platform, ScalacOpt}
 import scala.cli.CurrentParams
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.run.RunMode
 import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
 import scala.cli.commands.util.MainClassOptionsUtil.*
@@ -186,8 +187,7 @@ object Run extends ScalaCommand[RunOptions] with BuildCommandHelpers {
     if (CommandUtils.shouldCheckUpdate)
       Update.checkUpdateSafe(logger)
 
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val configDb = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

modules/cli/src/main/scala/scala/cli/commands/Test.scala

@@ -12,6 +12,7 @@ import scala.build.options.{BuildOptions, JavaOpt, Platform, Scope}
 import scala.build.testrunner.AsmTestRunner
 import scala.build.{Build, BuildThreads, Builds, CrossKey, Logger, Positioned}
 import scala.cli.CurrentParams
+import scala.cli.commands.publish.ConfigUtil._
 import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
 import scala.cli.commands.util.SharedOptionsUtil._
 import scala.cli.config.{ConfigDb, Keys}
@@ -65,9 +66,8 @@ object Test extends ScalaCommand[TestOptions] {
 
     val compilerMaker = options.shared.compilerMaker(threads).orExit(logger)
 
-    val cross = options.compileCross.cross.getOrElse(false)
-    val configDb = ConfigDb.open(options.shared.directories.directories)
-      .orExit(logger)
+    val cross    = options.compileCross.cross.getOrElse(false)
+    val configDb = options.shared.configDb
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)