Change cli to compile with Scala 3

Author: romanowski

.github/workflows/ci.yml

@@ -27,7 +27,8 @@ jobs:
         jvm: "temurin:17"
     - name: Unit 3.x tests
       run: |
-        ./mill -i _[3.1.1].compile
+        ./mill -i cli3.compile
+        ./mill -i cli3.test
         ./mill -i _[3.1.1].test
   jvm-tests:
     timeout-minutes: 120

build.sc

@@ -33,7 +33,9 @@ import _root_.scala.util.Properties
 implicit def millModuleBasePath: define.BasePath =
   define.BasePath(super.millModuleBasePath.value / "modules")
 
-object cli            extends Cli
+object cli extends Cli
+// remove once migrate to Scala 3
+object cli3           extends Cli { override def myScalaVersion = Scala.scala3 }
 object `cli-options`  extends CliOptions
 object `build-macros` extends Cross[BuildMacros](Scala.defaultInternal, Scala.scala3)
 object options        extends Cross[Options](Scala.defaultInternal, Scala.scala3)
@@ -196,9 +198,10 @@ class BuildMacros(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
 def asyncScalacOptions(scalaVersion: String) =
   if (scalaVersion.startsWith("3")) Nil else Seq("-Xasync")
 
-trait BuildLikeModule
-    extends ScalaCliCrossSbtModule with ScalaCliPublishModule with HasTests
-    with ScalaCliScalafixModule {
+trait ProtoBuildModule extends ScalaCliPublishModule with HasTests
+    with ScalaCliScalafixModule
+
+trait BuildLikeModule extends ScalaCliCrossSbtModule with ProtoBuildModule {
 
   def scalacOptions = T {
     super.scalacOptions() ++ Seq("-Ywarn-unused", "-deprecation")
@@ -484,28 +487,32 @@ trait CliOptions extends SbtModule with ScalaCliPublishModule with settings.Scal
   def scalaVersion = Scala.defaultInternal
 }
 
-trait Cli extends SbtModule with CliLaunchers with ScalaCliPublishModule with FormatNativeImageConf
-    with HasTests with HasMacroAnnotations with ScalaCliScalafixModule {
-  def scalaVersion = Scala.defaultInternal
+trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
+    with HasMacroAnnotations with FormatNativeImageConf {
+
+  def millSourcePath = super.millSourcePath / os.up / "cli"
+
+  def myScalaVersion = Scala.defaultInternal
+
+  def scalaVersion = T(myScalaVersion)
+
   def scalacOptions = T {
-    super.scalacOptions() ++ Seq("-Xasync", "-Ywarn-unused", "-deprecation")
+    super.scalacOptions() ++ asyncScalacOptions(scalaVersion()) ++ Seq("-Ywarn-unused")
   }
   def javacOptions = T {
     super.javacOptions() ++ Seq("--release", "16")
   }
   def moduleDeps = Seq(
-    build(Scala.defaultInternal),
-    `test-runner`(Scala.defaultInternal),
-    `cli-options`
+    build(myScalaVersion),
+    `cli-options`,
+    `test-runner`(myScalaVersion)
   )
 
   def repositories = super.repositories ++ customRepositories
 
   def ivyDeps = super.ivyDeps() ++ Agg(
-    Deps.caseApp,
     Deps.coursierLauncher,
     Deps.coursierPublish,
-    Deps.dataClass,
     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,
@@ -522,7 +529,7 @@ trait Cli extends SbtModule with CliLaunchers with ScalaCliPublishModule with Fo
 
   object test extends Tests with ScalaCliScalafixModule {
     def moduleDeps = super.moduleDeps ++ Seq(
-      build(Scala.defaultInternal).test
+      build(myScalaVersion).test
     )
   }
 }

modules/cli/src/main/scala/scala/cli/launcher/LauncherOptions.scala renamed to modules/cli-options/src/main/scala/scala/cli/lanuncher/LauncherOptions.scala

@@ -1,19 +1,19 @@
 package scala.cli.commands
 
 import coursier.env._
-import dataclass._
 
 // Only using this instead of coursier.env.WindowsEnvVarUpdater for the "\u0000" striping thing,
 // that earlier version of the Scala CLI may have left behind.
 // We should be able to switch back to coursier.env.WindowsEnvVarUpdater
 // after a bit of time (once super early users used this code more).
 
-@data class CustomWindowsEnvVarUpdater(
+case class CustomWindowsEnvVarUpdater(
   powershellRunner: PowershellRunner = PowershellRunner(),
-  @since
   useJni: Option[Boolean] = None
 ) extends EnvVarUpdater {
 
+  def withUseJni(opt: Option[Boolean]) = copy(useJni = opt)
+
   private lazy val useJni0 = useJni.getOrElse {
     // FIXME Should be coursier.paths.Util.useJni(), but it's not available from here.
     !System.getProperty("coursier.jni", "").equalsIgnoreCase("false")

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

@@ -41,9 +41,11 @@ object Fmt extends ScalaCommand[FmtOptions] {
   def readVersionFromFile(workspace: os.Path, logger: Logger): (Option[String], Boolean) = {
     case class ScalafmtVersionConfig(version: String = "")
     object ScalafmtVersionConfig {
-      lazy val default          = ScalafmtVersionConfig()
-      implicit lazy val surface = metaconfig.generic.deriveSurface[ScalafmtVersionConfig]
-      implicit lazy val decoder = metaconfig.generic.deriveDecoder[ScalafmtVersionConfig](default)
+      lazy val default = ScalafmtVersionConfig()
+      implicit lazy val surface: metaconfig.generic.Surface[ScalafmtVersionConfig] =
+        metaconfig.generic.deriveSurface[ScalafmtVersionConfig]
+      implicit lazy val decoder: metaconfig.ConfDecoder[ScalafmtVersionConfig] =
+        metaconfig.generic.deriveDecoder[ScalafmtVersionConfig](default)
     }
 
     val confName = ".scalafmt.conf"

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

@@ -2,7 +2,7 @@ package scala.cli.commands
 
 import caseapp._
 import coursier.launcher._
-import dependency.dependencyString
+import dependency._
 import packager.config._
 import packager.deb.DebianPackage
 import packager.docker.DockerPackage

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

@@ -28,17 +28,16 @@ object ProfileFileUpdater {
   ): Boolean = {
 
     def updated(content: String): Option[String] = {
-      val start = s"# >>> $title >>>\n"
-      val end   = s"# <<< $title <<<\n"
+      val start  = s"# >>> $title >>>\n"
+      val endStr = s"# <<< $title <<<\n"
       val withTags = "\n" +
         start +
-        addition.stripSuffix("\n") + "\n" +
-        end
+        addition.stripSuffix("\n") + "\n" + endStr
       if (content.contains(withTags))
         None
       else
         Some {
-          startEndIndices(start, end, content) match {
+          startEndIndices(start, endStr, content) match {
             case None =>
               content + withTags
             case Some((startIdx, endIdx)) =>

modules/cli/src/main/scala/scala/cli/internal/ProfileFileUpdater.scala

@@ -1,12 +1,13 @@
 package scala.cli.internal
 
+import coursier.Repositories
 import coursier.cache.{ArchiveCache, FileCache}
 import coursier.util.Task
-import coursier.{Repositories, moduleString}
 import org.scalajs.testing.adapter.{TestAdapterInitializer => TAI}
 
 import java.io.File
 
+import scala.build.CoursierUtils._
 import scala.build.EitherCps.{either, value}
 import scala.build.errors.{BuildException, ScalaJsLinkingError}
 import scala.build.internal.{FetchExternalBinary, Runner, ScalaJsLinkerConfig}
@@ -36,13 +37,13 @@ object ScalaJsLinker {
             val scalaJsCliDep = {
               val mod =
                 if (scalaJsCliVersion.contains("-sc"))
-                  mod"io.github.alexarchambault.tmp:scalajs-cli_2.13"
-                else mod"org.scala-js:scalajs-cli_2.13"
+                  cmod"io.github.alexarchambault.tmp:scalajs-cli_2.13"
+                else cmod"org.scala-js:scalajs-cli_2.13"
               coursier.Dependency(mod, scalaJsCliVersion)
             }
 
             val forcedVersions = Seq(
-              mod"org.scala-js:scalajs-linker_2.13" -> scalaJsVersion
+              cmod"org.scala-js:scalajs-linker_2.13" -> scalaJsVersion
             )
 
             val extraRepos =

modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala

@@ -2,7 +2,7 @@ package scala.cli.runner
 
 object Stacktrace {
 
-  def print(t: Throwable, prefix: String): Boolean =
+  def print(t: Throwable, prefix: String, verbosity: Int): Boolean =
     false
 
 }

modules/runner/src/main/scala-3-unstable/scala/cli/runner/Stacktrace.scala

@@ -61,13 +61,12 @@ object Deps {
   // Force using of 2.13 - is there a better way?
   def bloopConfig      = ivy"io.github.alexarchambault.bleep:bloop-config_2.13:1.4.19-1"
   def bsp4j            = ivy"ch.epfl.scala:bsp4j:2.0.0"
-  def caseApp          = ivy"com.github.alexarchambault::case-app:2.1.0-M13"
+  def caseApp          = ivy"com.github.alexarchambault:case-app_2.13:2.1.0-M13"
   def collectionCompat = ivy"org.scala-lang.modules::scala-collection-compat:2.7.0"
   // Force using of 2.13 - is there a better way?
   def coursierJvm      = ivy"io.get-coursier:coursier-jvm_2.13:${Versions.coursier}"
-  def coursierLauncher = ivy"io.get-coursier::coursier-launcher:${Versions.coursier}"
-  def coursierPublish  = ivy"io.get-coursier.publish::publish:0.1.0"
-  def dataClass        = ivy"io.github.alexarchambault::data-class:0.2.5"
+  def coursierLauncher = ivy"io.get-coursier:coursier-launcher_2.13:${Versions.coursier}"
+  def coursierPublish  = ivy"io.get-coursier.publish:publish_2.13:0.1.0"
   // TODO - update to working version
   def dependency   = ivy"io.get-coursier::dependency:0.2.2"
   def dockerClient = ivy"com.spotify:docker-client:8.16.0"
@@ -103,8 +102,8 @@ object Deps {
   def scalaJsTestAdapter = ivy"org.scala-js:scalajs-sbt-test-adapter_2.13:${Scala.scalaJs}"
   // Force using of 2.13 - is there a better way?
   def scalametaTrees   = ivy"org.scalameta:trees_2.13:${Versions.scalaMeta}"
-  def scalaPackager    = ivy"org.virtuslab::scala-packager:${Versions.scalaPackager}"
-  def scalaPackagerCli = ivy"org.virtuslab::scala-packager-cli:${Versions.scalaPackager}"
+  def scalaPackager    = ivy"org.virtuslab:scala-packager_2.13:${Versions.scalaPackager}"
+  def scalaPackagerCli = ivy"org.virtuslab:scala-packager-cli_2.13:${Versions.scalaPackager}"
   // Force using of 2.13 - is there a better way?
   def scalaparse               = ivy"com.lihaoyi:scalaparse_2.13:2.3.3"
   def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv"