Merge pull request #7433 from adpi2/sbt-2-cross-building

[2.x] Remove cross-building except for lower utils

.github/workflows/ci.yml

@@ -126,8 +126,10 @@ jobs:
         # ./sbt -v --client "serverTestProj/test"
         # ./sbt -v --client doc
         ./sbt -v --client "all $UTIL_TESTS"
-        # ./sbt -v --client ++$SCALA_213
-        # ./sbt -v --client "all $UTIL_TESTS"
+        ./sbt -v --client ++$SCALA_213
+        ./sbt -v --client "all $UTIL_TESTS"
+        ./sbt -v --client ++$SCALA_212
+        ./sbt -v --client "all $UTIL_TESTS"
     - name: Build and test (2)
       if: ${{ matrix.jobtype == 2 }}
       shell: bash
@@ -149,11 +151,13 @@ jobs:
         # ./sbt -v "repoOverrideTest:scripted dependency-management/*"
         ./sbt -v "scripted source-dependencies/*"
         # ./sbt -v "scripted project/*"
-    # - name: Build and test (5)
-    #  if: ${{ matrix.jobtype == 5 }}
-    #  shell: bash
-    #  run: |
-    #    ./sbt -v "++$SCALA_213!; test; ++$SCALA_3!; all utilControl/test utilRelation/test utilPosition/test"
+    - name: Build and test (5)
+      if: ${{ matrix.jobtype == 5 }}
+      shell: bash
+      run: |
+        ./sbt -v --client test
+        ./sbt -v --client "++$SCALA_213; all $UTIL_TESTS"
+        ./sbt -v --client "++$SCALA_212; all $UTIL_TESTS"
     # - name: Build and test (6)
     #  if: ${{ matrix.jobtype == 6 }}
     #  shell: bash

build.sbt

@@ -98,7 +98,6 @@ def commonBaseSettings: Seq[Setting[_]] = Def.settings(
     (Compile / unmanagedSources / inputFileStamps).dependsOn(Compile / javafmtOnCompile).value,
   Test / unmanagedSources / inputFileStamps :=
     (Test / unmanagedSources / inputFileStamps).dependsOn(Test / javafmtOnCompile).value,
-  crossScalaVersions := List(scala212, scala213),
   Test / publishArtifact := false,
   run / fork := true,
 )
@@ -112,8 +111,11 @@ def commonSettings: Seq[Setting[_]] =
       }
     }
   }
-def utilCommonSettings: Seq[Setting[_]] =
-  baseSettings :+ (crossScalaVersions := (scala212 :: scala213 :: Nil))
+
+def utilCommonSettings: Seq[Setting[_]] = Def.settings(
+  baseSettings,
+  crossScalaVersions := Seq(scala212, scala213, scala3)
+)
 
 def minimalSettings: Seq[Setting[_]] =
   commonSettings ++ customCommands ++
@@ -257,12 +259,11 @@ lazy val bundledLauncherProj =
 /* ** subproject declarations ** */
 
 val collectionProj = (project in file("util-collection"))
-  .dependsOn(utilPosition)
+  .dependsOn(utilPosition, utilCore)
   .settings(
     name := "Collections",
     testedBaseSettings,
-    utilCommonSettings,
-    Util.keywordsSettings,
+    baseSettings,
     libraryDependencies ++= Seq(sjsonNewScalaJson.value),
     libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, major)) if major <= 12 => Seq()
@@ -309,8 +310,7 @@ val logicProj = (project in file("internal") / "util-logic")
 //   the analysis compiler phases and passed back to sbt.  The API structures are defined in a simple
 //   format from which Java sources are generated by the datatype generator Projproject
 lazy val utilInterface = (project in file("internal") / "util-interface").settings(
-  utilCommonSettings,
-  crossScalaVersions := List(scala212),
+  baseSettings,
   javaOnlySettings,
   crossPaths := false,
   autoScalaLibrary := false,
@@ -335,9 +335,23 @@ lazy val utilPosition = (project in file("internal") / "util-position")
     utilMimaSettings,
   )
 
+lazy val utilCore = project
+  .in(file("internal") / "util-core")
+  .settings(
+    utilCommonSettings,
+    name := "Util Core",
+    libraryDependencies ++= {
+      if (scalaBinaryVersion.value.startsWith("2")) {
+        Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
+      } else Seq.empty
+    },
+    Util.keywordsSettings,
+    utilMimaSettings
+  )
+
 lazy val utilLogging = (project in file("internal") / "util-logging")
   .enablePlugins(ContrabandPlugin, JsonCodecPlugin)
-  .dependsOn(utilInterface, collectionProj, coreMacrosProj)
+  .dependsOn(utilInterface, utilCore)
   .settings(
     utilCommonSettings,
     name := "Util Logging",
@@ -505,7 +519,6 @@ lazy val testingProj = (project in file("testing"))
 lazy val testAgentProj = (project in file("testing") / "agent")
   .settings(
     minimalSettings,
-    crossScalaVersions := Seq(baseScalaVersion),
     crossPaths := false,
     autoScalaLibrary := false,
     Compile / doc / javacOptions := Nil,
@@ -595,7 +608,6 @@ lazy val scriptedSbtReduxProj = (project in file("scripted-sbt-redux"))
   .dependsOn(sbtProj % "compile;test->test", commandProj, utilLogging, utilScripted)
   .settings(
     baseSettings,
-    crossScalaVersions := Seq(baseScalaVersion),
     name := "Scripted sbt Redux",
     libraryDependencies ++= Seq(launcherInterface % "provided"),
     mimaSettings,
@@ -607,7 +619,6 @@ lazy val scriptedSbtOldProj = (project in file("scripted-sbt-old"))
   .dependsOn(scriptedSbtReduxProj)
   .settings(
     baseSettings,
-    crossScalaVersions := Seq(baseScalaVersion),
     name := "Scripted sbt",
     mimaSettings,
     mimaBinaryIssueFilters ++= Seq(
@@ -635,7 +646,6 @@ lazy val dependencyTreeProj = (project in file("dependency-tree"))
   .settings(
     sbtPlugin := true,
     baseSettings,
-    crossScalaVersions := Seq(baseScalaVersion),
     name := "sbt-dependency-tree",
     publishMavenStyle := true,
     // mimaSettings,
@@ -793,7 +803,7 @@ lazy val commandProj = (project in file("main-command"))
 lazy val coreMacrosProj = (project in file("core-macros"))
   .dependsOn(collectionProj)
   .settings(
-    testedBaseSettings :+ (crossScalaVersions := (scala212 :: scala213 :: Nil)),
+    testedBaseSettings,
     name := "Core Macros",
     SettingKey[Boolean]("exportPipelining") := false,
     mimaSettings,
@@ -964,7 +974,6 @@ lazy val sbtProj = (project in file("sbt-app"))
       if (scalaVersion.value == baseScalaVersion) version.value
       else version2_13.value
     },
-    crossScalaVersions := Seq(baseScalaVersion),
     crossPaths := false,
     crossTarget := { target.value / scalaVersion.value },
     javaOptions ++= Seq("-Xdebug", "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"),
@@ -990,7 +999,6 @@ lazy val serverTestProj = (project in file("server-test"))
   .dependsOn(sbtProj % "compile->test", scriptedSbtReduxProj % "compile->test")
   .settings(
     testedBaseSettings,
-    crossScalaVersions := Seq(baseScalaVersion),
     bspEnabled := false,
     publish / skip := true,
     // make server tests serial
@@ -1118,8 +1126,7 @@ lazy val sbtBig = (project in file(".big"))
 lazy val lowerUtils = (project in (file("internal") / "lower"))
   .aggregate(lowerUtilProjects.map(p => LocalProject(p.id)): _*)
   .settings(
-    publish / skip := true,
-    crossScalaVersions := Nil,
+    publish / skip := true
   )
 
 lazy val upperModules = (project in (file("internal") / "upper"))
@@ -1128,8 +1135,7 @@ lazy val upperModules = (project in (file("internal") / "upper"))
       diff Seq(bundledLauncherProj)).map(p => LocalProject(p.id)): _*
   )
   .settings(
-    publish / skip := true,
-    crossScalaVersions := Nil,
+    publish / skip := true
   )
 
 lazy val sbtIgnoredProblems = {
@@ -1184,7 +1190,6 @@ lazy val vscodePlugin = (project in file("vscode-sbt-scala"))
   .settings(
     bspEnabled := false,
     crossPaths := false,
-    crossScalaVersions := Seq(baseScalaVersion),
     publish / skip := true,
     Compile / compile := {
       val _ = update.value
@@ -1266,8 +1271,7 @@ def allProjects =
 // These need to be cross published to 2.12 and 2.13 for Zinc
 lazy val lowerUtilProjects =
   Seq(
-    collectionProj,
-    coreMacrosProj,
+    utilCore,
     utilCache,
     utilControl,
     utilInterface,

internal/util-core/src/main/scala-2/sbt/internal/util/appmacro/StringTypeTag.scala

@@ -0,0 +1,38 @@
+/*
+ * sbt
+ * Copyright 2023, Scala center
+ * Copyright 2011 - 2022, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
+package sbt.internal.util.appmacro
+
+import scala.language.experimental.macros
+import scala.reflect.macros.blackbox
+
+/** This is used to carry type information in JSON. */
+final case class StringTypeTag[A](key: String) {
+  override def toString: String = key
+}
+
+object StringTypeTag {
+
+  /** Generates a StringTypeTag for any type at compile time. */
+  implicit def fast[A]: StringTypeTag[A] = macro impl[A]
+
+  def impl[A: c.WeakTypeTag](c: blackbox.Context): c.Tree = {
+    import c.universe._
+    val tpe = weakTypeOf[A]
+    def typeToString(tpe: Type): String = tpe match {
+      case TypeRef(_, sym, args) if args.nonEmpty =>
+        val typeCon = tpe.typeSymbol.fullName
+        val typeArgs = args map typeToString
+        s"""$typeCon[${typeArgs.mkString(",")}]"""
+      case _ => tpe.toString
+    }
+
+    val key = Literal(Constant(typeToString(tpe)))
+    q"new sbt.internal.util.appmacro.StringTypeTag[$tpe]($key)"
+  }
+}

internal/util-core/src/main/scala/sbt/internal/util/Util.scala

@@ -9,15 +9,9 @@ package sbt.internal.util
 
 import java.util.Locale
 
-import scala.reflect.macros.blackbox
-import scala.language.experimental.macros
-
 object Util {
   def makeList[T](size: Int, value: T): List[T] = List.fill(size)(value)
 
-  // def separateE[A, B](ps: Seq[Either[A, B]]): (Seq[A], Seq[B]) =
-  //   separate(ps)(Types.idFun)
-
   def separate[T, A, B](ps: Seq[T])(f: T => Either[A, B]): (Seq[A], Seq[B]) = {
     val (a, b) = ps.foldLeft((Nil: Seq[A], Nil: Seq[B]))((xs, y) => prependEither(xs, f(y)))
     (a.reverse, b.reverse)
@@ -45,8 +39,10 @@ object Util {
 
   def quoteIfKeyword(s: String): String = if (ScalaKeywords.values(s)) s"`${s}`" else s
 
-  def ignoreResult[A](f: => A): Unit =
-    f; ()
+  def ignoreResult[A](f: => A): Unit = {
+    val _ = f
+    ()
+  }
 
   lazy val isMac: Boolean =
     System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("mac")
@@ -74,7 +70,4 @@ object Util {
   implicit class AnyOps[A](private val value: A) extends AnyVal {
     def some: Option[A] = (Some(value): Option[A])
   }
-  // class Macro(val c: blackbox.Context) {
-  //   def ignore(f: c.Tree): c.Expr[Unit] = c.universe.reify({ c.Expr[Any](f).splice; () })
-  // }
 }

internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala

@@ -9,7 +9,6 @@ package sbt.internal.util
 
 import sbt.internal.util.codec.JsonProtocol._
 import sbt.util._
-import scala.reflect.runtime.universe.TypeTag
 import sjsonnew.JsonFormat
 import sbt.internal.util.appmacro.StringTypeTag
 
@@ -44,10 +43,7 @@ class ManagedLogger(
   // send special event for success since it's not a real log level
   override def success(message: => String): Unit = {
     if (terminal.fold(true)(_.isSuccessEnabled)) {
-      infoEvent[SuccessEvent](SuccessEvent(message))(
-        implicitly[JsonFormat[SuccessEvent]],
-        StringTypeTag[SuccessEvent],
-      )
+      infoEvent[SuccessEvent](SuccessEvent(message))
     }
   }
 

internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala

@@ -604,6 +604,9 @@ object Terminal {
   private[sbt] def withPrintStream[T](f: PrintStream => T): T = console.withPrintStream(f)
   private[this] val attached = new AtomicBoolean(true)
 
+  private[sbt] val NullTerminal = new DefaultTerminal(nullInputStream, _ => (), _ => ())
+  private[sbt] val SimpleTerminal = new DefaultTerminal(originalIn, originalOut, originalErr)
+
   /**
    * A wrapped instance of a jline.Terminal2 instance. It should only ever be changed when the
    * backgrounds sbt with ctrl+z and then foregrounds sbt which causes a call to reset. The
@@ -1029,7 +1032,11 @@ object Terminal {
     catch { case _: InterruptedException => }
     -1
   }
-  private[sbt] class DefaultTerminal extends Terminal {
+  private[sbt] class DefaultTerminal(
+      val inputStream: InputStream,
+      val outputStream: OutputStream,
+      val errorStream: OutputStream
+  ) extends Terminal {
     override def close(): Unit = {}
     override private[sbt] def progressState: ProgressState = new ProgressState(1)
     override private[sbt] def enterRawMode(): Unit = {}
@@ -1042,15 +1049,12 @@ object Terminal {
     override def getNumericCapability(capability: String): Integer = null
     override def getStringCapability(capability: String): String = null
     override def getWidth: Int = 0
-    override def inputStream: InputStream = nullInputStream
     override def isAnsiSupported: Boolean = Terminal.isAnsiSupported
     override def isColorEnabled: Boolean = isColorEnabledProp.getOrElse(Terminal.isColorEnabled)
     override def isEchoEnabled: Boolean = false
     override def isSuccessEnabled: Boolean = true
     override def isSupershellEnabled: Boolean = false
     override def setEchoEnabled(toggle: Boolean): Unit = {}
-    override def outputStream: OutputStream = _ => {}
-    override def errorStream: OutputStream = _ => {}
     override private[sbt] def getAttributes: Map[String, String] = Map.empty
     override private[sbt] def setAttributes(attributes: Map[String, String]): Unit = {}
     override private[sbt] def setSize(width: Int, height: Int): Unit = {}
@@ -1061,10 +1065,4 @@ object Terminal {
     override private[sbt] def write(bytes: Int*): Unit = {}
     override private[sbt] def withRawOutput[R](f: => R): R = f
   }
-  private[sbt] object NullTerminal extends DefaultTerminal
-  private[sbt] object SimpleTerminal extends DefaultTerminal {
-    override lazy val inputStream: InputStream = originalIn
-    override lazy val outputStream: OutputStream = originalOut
-    override lazy val errorStream: OutputStream = originalErr
-  }
 }

internal/util-logging/src/main/scala/sbt/util/LogExchange.scala

@@ -44,23 +44,14 @@ sealed abstract class LogExchange {
     ()
   }
 
-  // Construct these StringTypeTags manually, because they're used at the very startup of sbt
-  // and we'll try not to initialize the universe by using the StringTypeTag.apply that requires a TypeTag
-  // A better long-term solution could be to make StringTypeTag.apply a macro.
-  lazy val stringTypeTagThrowable = StringTypeTag.manually[Throwable]("java.lang.Throwable")
-  lazy val stringTypeTagTraceEvent =
-    StringTypeTag.manually[TraceEvent]("sbt.internal.util.TraceEvent")
-  lazy val stringTypeTagSuccessEvent =
-    StringTypeTag.manually[SuccessEvent]("sbt.internal.util.SuccessEvent")
-
   private[sbt] def initStringCodecs(): Unit = {
     import sbt.internal.util.codec.SuccessEventShowLines._
     import sbt.internal.util.codec.ThrowableShowLines._
     import sbt.internal.util.codec.TraceEventShowLines._
 
-    registerStringCodecByStringTypeTag(stringTypeTagThrowable)
-    registerStringCodecByStringTypeTag(stringTypeTagTraceEvent)
-    registerStringCodecByStringTypeTag(stringTypeTagSuccessEvent)
+    registerStringCodec[Throwable]
+    registerStringCodec[TraceEvent]
+    registerStringCodec[SuccessEvent]
   }
 
   // This is a dummy layout to avoid casting error during PatternLayout.createDefaultLayout()
@@ -86,11 +77,8 @@ sealed abstract class LogExchange {
     stringCodecs.getOrElseUpdate(tag, v).asInstanceOf[ShowLines[A]]
 
   private[sbt] def registerStringCodec[A: ShowLines: StringTypeTag]: Unit = {
-    registerStringCodecByStringTypeTag(implicitly[StringTypeTag[A]])
-  }
-
-  private[sbt] def registerStringCodecByStringTypeTag[A: ShowLines](tag: StringTypeTag[A]): Unit = {
     val ev = implicitly[ShowLines[A]]
+    val tag = implicitly[StringTypeTag[A]]
     val _ = getOrElseUpdateStringCodec(tag.key, ev)
   }
 

internal/util-logging/src/test/scala/LogExchangeSpec.scala

@@ -1,44 +0,0 @@
-/*
- * sbt
- * Copyright 2011 - 2018, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
- * Licensed under Apache License 2.0 (see LICENSE)
- */
-
-package sbt.util
-
-import sbt.internal.util._
-import sbt.internal.util.appmacro.StringTypeTag
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
-
-class LogExchangeSpec extends AnyFlatSpec with Matchers {
-  import LogExchange._
-
-  checkTypeTag("stringTypeTagThrowable", stringTypeTagThrowable, StringTypeTag[Throwable])
-
-  checkTypeTag(
-    "stringTypeTagTraceEvent",
-    stringTypeTagTraceEvent,
-    StringTypeTag[TraceEvent]
-  )
-  checkTypeTag(
-    "stringTypeTagSuccessEvent",
-    stringTypeTagSuccessEvent,
-    StringTypeTag[SuccessEvent]
-  )
-
-  private def checkTypeTag[A](name: String, inc: StringTypeTag[A], exp: StringTypeTag[A]): Unit =
-    s"LogExchange.$name" should s"match real StringTypeTag[$exp]" in {
-      val incomingString = inc.key
-      val expectedString = exp.key
-      if ((incomingString startsWith "scala.") || (expectedString startsWith "scala.")) {
-        // > historically [Scala] has been inconsistent whether `scala.` is included, or not
-        // > would it be hard to make the test accept either result?
-        // https://github.com/scala/community-builds/pull/758#issuecomment-409760633
-        assert((incomingString stripPrefix "scala.") == (expectedString stripPrefix "scala."))
-      } else {
-        assert(incomingString == expectedString)
-      }
-    }
-}

internal/util-logging/src/test/scala/ManagedLoggerSpec.scala

@@ -92,7 +92,7 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers {
     } {
       pool.submit(new Runnable {
         def run(): Unit = {
-          val stringTypeTag = StringTypeTag[List[Int]]
+          val stringTypeTag = implicitly[StringTypeTag[List[Int]]]
           val log = newLogger(s"foo$i")
           context.addAppender(s"foo$i", asyncStdout -> Level.Info)
           if (i % 100 == 0) {

project/plugins.sbt

@@ -4,7 +4,7 @@ scalacOptions ++= Seq("-feature", "-language:postfixOps", "-Ywarn-unused:_,-impo
 
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.5")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")

util-cache/src/main/scala/sbt/util/FileInfo.scala

@@ -64,7 +64,7 @@ final case class FilesInfo[F <: FileInfo] private[sbt] (files: Set[F])
 object FilesInfo {
   def empty[F <: FileInfo]: FilesInfo[F] = FilesInfo(Set.empty[F])
 
-  given format[F <: FileInfo: JsonFormat]: JsonFormat[FilesInfo[F]] =
+  implicit def format[F <: FileInfo: JsonFormat]: JsonFormat[FilesInfo[F]] =
     projectFormat(_.files, (fs: Set[F]) => FilesInfo(fs))
 
   def full: FileInfo.Style = FileInfo.full

util-cache/src/main/scala/sbt/util/Input.scala

@@ -30,8 +30,9 @@ class PlainInput[J: IsoString](input: InputStream, converter: SupportConverter[J
       val bufferSize = 1024
       val buffer = new Array[Char](bufferSize)
       var read = 0
-      while { read = reader.read(buffer, 0, bufferSize); read != -1 } do
+      while ({ read = reader.read(buffer, 0, bufferSize); read != -1 }) {
         builder.appendAll(buffer, 0, read)
+      }
 
       builder.toString()
     }