Merge pull request #10498 from dotty-staging/upgrade/sbt-1.4.4

Author: smarter

.gitmodules

@@ -13,12 +13,6 @@
 [submodule "community-build/community-projects/scalatest"]
 	path = community-build/community-projects/scalatest
 	url = https://github.com/dotty-staging/scalatest
-[submodule "community-build/community-projects/scopt"]
-	path = community-build/community-projects/scopt
-	url = https://github.com/dotty-staging/scopt
-[submodule "community-build/community-projects/squants"]
-	path = community-build/community-projects/squants
-	url = https://github.com/dotty-staging/squants
 [submodule "community-build/community-projects/scalap"]
 	path = community-build/community-projects/scalap
 	url = https://github.com/dotty-staging/scala

community-build/community-projects/minitest

@@ -72,7 +72,18 @@ final case class SbtCommunityProject(
     dependencies: List[CommunityProject] = Nil,
     sbtPublishCommand: String = null) extends CommunityProject:
   override val binaryName: String = "sbt"
-  private val baseCommand = s";clean ;set logLevel in Global := Level.Error ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++$compilerVersion! "
+
+  val dependencyOverrides = List(
+    // dependencyOverrides doesn't seem to understand `%%%`
+    """"org.scalacheck" %% "scalacheck" % "1.15.2-SNAPSHOT"""",
+    """"org.scalacheck" %% "scalacheck_sjs1" % "1.15.2-SNAPSHOT""""
+  )
+
+  private val baseCommand =
+    "clean; set logLevel in Global := Level.Error; set updateOptions in Global ~= (_.withLatestSnapshots(false)); "
+    ++ s"""set dependencyOverrides in ThisBuild ++= ${dependencyOverrides.mkString("Seq(", ", ", ")")}; """
+    ++ s"++$compilerVersion!; "
+
   override val testCommand = s"$baseCommand$sbtTestCommand"
   override val publishCommand = s"$baseCommand$sbtPublishCommand"
 
@@ -85,7 +96,7 @@ final case class SbtCommunityProject(
       if (forceUpgradeSbtScalajsPlugin) List(s"--addPluginSbtFile=$sbtScalaJSPluginFilePath")
       else Nil
     extraSbtArgs ++ sbtProps ++ List(
-      "-sbt-version", "1.3.8",
+      "-sbt-version", "1.4.4",
        "-Dsbt.supershell=false",
       s"--addPluginSbtFile=$sbtPluginFilePath"
     ) ++ scalaJSPluginArgs
@@ -172,14 +183,14 @@ object projects:
 
   lazy val scalacheck = SbtCommunityProject(
     project       = "scalacheck",
-    sbtTestCommand   = "jvm/test",
-    sbtPublishCommand = ";set jvm/publishArtifact in (Compile, packageDoc) := false ;jvm/publishLocal"
+    sbtTestCommand   = "jvm/test;js/test",
+    sbtPublishCommand = "jvm/publishLocal;js/publishLocal"
   )
 
   lazy val scalatest = SbtCommunityProject(
     project       = "scalatest",
-    sbtTestCommand   = ";scalacticDotty/clean;scalacticTestDotty/test;scalatestTestDotty/test",
-    sbtPublishCommand = ";scalacticDotty/publishLocal; scalatestDotty/publishLocal"
+    sbtTestCommand   = "scalacticDotty/clean;scalacticTestDotty/test; scalatestTestDotty/test",
+    sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal"
   )
 
   lazy val scalatestplusScalacheck = SbtCommunityProject(
@@ -194,21 +205,11 @@ object projects:
     sbtTestCommand   = "xml/test",
   )
 
-  lazy val scopt = SbtCommunityProject(
-    project       = "scopt",
-    sbtTestCommand   = "scoptJVM/compile",
-  )
-
   lazy val scalap = SbtCommunityProject(
     project       = "scalap",
     sbtTestCommand   = "scalap/compile",
   )
 
-  lazy val squants = SbtCommunityProject(
-    project       = "squants",
-    sbtTestCommand   = "squantsJVM/compile",
-  )
-
   lazy val betterfiles = SbtCommunityProject(
     project       = "betterfiles",
     sbtTestCommand   = "dotty-community-build/compile",
@@ -221,7 +222,8 @@ object projects:
 
   lazy val minitest = SbtCommunityProject(
     project       = "minitest",
-    sbtTestCommand   = "dotty-community-build/compile",
+    sbtTestCommand   = "test",
+    dependencies = List(scalacheck)
   )
 
   lazy val fastparse = SbtCommunityProject(
@@ -233,7 +235,7 @@ object projects:
     project       = "stdLib213",
     extraSbtArgs  = List("-Dscala.build.compileWithDotty=true"),
     sbtTestCommand   = """library/compile""",
-    sbtPublishCommand = """;set publishArtifact in (library, Compile, packageDoc) := false ;library/publishLocal""",
+    sbtPublishCommand = """set publishArtifact in (library, Compile, packageDoc) := false ;library/publishLocal""",
   )
 
   lazy val shapeless = SbtCommunityProject(
@@ -256,9 +258,9 @@ object projects:
     // has not been updated since 2018, so no 2.13 compat. Some akka tests are dropped due to MutableBehaviour being
     // dropped in the 2.13 compatible release
 
-    // sbtTestCommand   = ";set ThisBuild / useEffpiPlugin := false; effpi/test:compile; plugin/test:compile; benchmarks/test:compile; examples/test:compile; pluginBenchmarks/test:compile",
+    // sbtTestCommand   = "set ThisBuild / useEffpiPlugin := false; effpi/test:compile; plugin/test:compile; benchmarks/test:compile; examples/test:compile; pluginBenchmarks/test:compile",
 
-    sbtTestCommand   = ";set ThisBuild / useEffpiPlugin := false; effpi/test:compile; benchmarks/test:compile; examples/test:compile; pluginBenchmarks/test:compile",
+    sbtTestCommand   = "set ThisBuild / useEffpiPlugin := false; effpi/test:compile; benchmarks/test:compile; examples/test:compile; pluginBenchmarks/test:compile",
   )
 
   // TODO @odersky? It got broken by #5458
@@ -313,7 +315,7 @@ object projects:
 
   lazy val endpoints4s = SbtCommunityProject(
     project        = "endpoints4s",
-    sbtTestCommand = ";json-schemaJVM/compile;algebraJVM/compile;openapiJVM/compile;http4s-server/compile;http4s-client/compile;play-server/compile;play-client/compile;akka-http-server/compile;akka-http-client/compile"
+    sbtTestCommand = "json-schemaJVM/compile;algebraJVM/compile;openapiJVM/compile;http4s-server/compile;http4s-client/compile;play-server/compile;play-client/compile;akka-http-server/compile;akka-http-client/compile"
   )
 
   lazy val catsEffect2 = SbtCommunityProject(

community-build/community-projects/scalacheck

@@ -123,9 +123,7 @@ class CommunityBuildTestB extends CommunityBuildTest:
   @Test def scalaz = projects.scalaz.run()
   @Test def scas = projects.scas.run()
   @Test def sconfig = projects.sconfig.run()
-  @Test def scopt = projects.scopt.run()
   @Test def shapeless = projects.shapeless.run()
-  @Test def squants = projects.squants.run()
   @Test def stdLib213 = projects.stdLib213.run()
   @Test def xmlInterpolator = projects.xmlInterpolator.run()
   @Test def zio = projects.zio.run()

community-build/community-projects/scopt

@@ -211,7 +211,14 @@ object Build {
         }
       // Do not cut off the bottom of large stack traces (default is 1024)
       "-XX:MaxJavaStackTraceDepth=1000000" :: agentOptions ::: ciOptions
-    }
+    },
+
+    excludeLintKeys ++= Set(
+      // We set these settings in `commonSettings`, if a project
+      // uses `commonSettings` but overrides `unmanagedSourceDirectories`,
+      // sbt will complain if we don't exclude them here.
+      Keys.scalaSource, Keys.javaSource
+    ),
   )
 
   lazy val disableDocSetting =
@@ -1197,6 +1204,12 @@ object Build {
       unmanagedSourceDirectories in Compile +=
         baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config",
       sbtTestDirectory := baseDirectory.value / "sbt-test",
+
+      // The batch mode accidentally became the default with no way to disable
+      // it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
+      // We enable it explicitly here to make it clear that we're using it.
+      scriptedBatchExecution := true,
+
       scriptedLaunchOpts ++= Seq(
         "-Dplugin.version=" + version.value,
         "-Dplugin.scalaVersion=" + dottyVersion,

community-build/community-projects/squants

@@ -1 +1 @@
-sbt.version=1.3.12
+sbt.version=1.4.4

community-build/community-projects/stdLib213

@@ -1,9 +1,25 @@
+import sbt.internal.inc.Analysis
 import complete.DefaultParsers._
 
-InputKey[Unit]("check-number-of-compiler-iterations") := {
-  val args = spaceDelimited("<arg>").parsed
-  val a = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
-  assert(args.size == 1)
-  val expectedIterationsNumber = args(0).toInt
-  assert(a.compilations.allCompilations.size == expectedIterationsNumber, "a.compilations.allCompilations.size = %d (expected %d)".format(a.compilations.allCompilations.size, expectedIterationsNumber))
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
+
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
+
+checkIterations := {
+  val expected: Int = (Space ~> NatBasic).parsed
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
+  assert(expected == actual, s"Expected $expected compilations, got $actual")
 }

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -1,3 +1,4 @@
+> recordPreviousIterations
 # Test for separate compilation and proper value of
 # the OVERRIDE flag when abstract types, type alias
 # and structural type are involved
@@ -11,4 +12,4 @@ $ copy-file changes/Bar1.scala src/main/scala/Bar.scala
 # second iteration
 #> compile
 # check if there are only two compile iterations performed
-> checkNumberOfCompilerIterations 2
+> checkIterations 2

project/Build.scala

@@ -1,12 +1,25 @@
+import sbt.internal.inc.Analysis
 import complete.DefaultParsers._
 
-val checkIterations = inputKey[Unit]("Verifies the accumlated number of iterations of incremental compilation.")
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
 
-checkIterations := {
-  val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
 
+checkIterations := {
   val expected: Int = (Space ~> NatBasic).parsed
-  val actual: Int = analysis.compilations.allCompilations.size
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
   assert(expected == actual, s"Expected $expected compilations, got $actual")
 }
-

project/build.properties

@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}

sbt-dotty/sbt-test/source-dependencies/abstract-type-override/build.sbt

@@ -1,3 +1,4 @@
+> recordPreviousIterations
 # Tests that classpath entries that are different than their canonical representation are
 #  handled properly.  In particular, a symlink from lib/a.jar to lib/../actual/a.jar.0 is 
 #  available on the classpath and read by scalac.  scalac 2.10.x does not interpret .jar.0

sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/CompileState.scala

@@ -1,12 +1,25 @@
+import sbt.internal.inc.Analysis
 import complete.DefaultParsers._
 
-val checkIterations = inputKey[Unit]("Verifies the accumlated number of iterations of incremental compilation.")
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
 
-checkIterations := {
-  val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
 
+checkIterations := {
   val expected: Int = (Space ~> NatBasic).parsed
-  val actual: Int = analysis.compilations.allCompilations.size
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
   assert(expected == actual, s"Expected $expected compilations, got $actual")
 }
-

sbt-dotty/sbt-test/source-dependencies/abstract-type-override/test

@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}

sbt-dotty/sbt-test/source-dependencies/canon/build.sbt

@@ -1,3 +1,4 @@
+> recordPreviousIterations
 > compile
 $ copy-file changes/A2.scala A.scala
 # Second compilation round, there should be no third round (we don't need to recompile B.scala)

sbt-dotty/sbt-test/source-dependencies/canon/project/CompileState.scala

@@ -1,12 +1,25 @@
+import sbt.internal.inc.Analysis
 import complete.DefaultParsers._
 
-val checkIterations = inputKey[Unit]("Verifies the accumlated number of iterations of incremental compilation.")
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
 
-checkIterations := {
-  val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
 
+checkIterations := {
   val expected: Int = (Space ~> NatBasic).parsed
-  val actual: Int = analysis.compilations.allCompilations.size
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
   assert(expected == actual, s"Expected $expected compilations, got $actual")
 }
-

sbt-dotty/sbt-test/source-dependencies/canon/test

@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}

sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/build.sbt

@@ -1,3 +1,4 @@
+> recordPreviousIterations
 > compile
 # Force recompilation of B, B.getInline hasn't changed so C shouldn't be recompiled.
 $ copy-file changes/B1.scala B.scala

sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/CompileState.scala

@@ -1,12 +1,25 @@
+import sbt.internal.inc.Analysis
 import complete.DefaultParsers._
 
-val checkIterations = inputKey[Unit]("Verifies the accumlated number of iterations of incremental compilation.")
+// Reset compiler iterations, necessary because tests run in batch mode
+val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
+recordPreviousIterations := {
+  val log = streams.value.log
+  CompileState.previousIterations = {
+    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
+    previousAnalysis match {
+      case None =>
+        log.info("No previous analysis detected")
+        0
+      case Some(a: Analysis) => a.compilations.allCompilations.size
+    }
+  }
+}
 
-checkIterations := {
-  val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
+val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
 
+checkIterations := {
   val expected: Int = (Space ~> NatBasic).parsed
-  val actual: Int = analysis.compilations.allCompilations.size
+  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
   assert(expected == actual, s"Expected $expected compilations, got $actual")
 }
-

sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/test

@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var previousIterations: Int = -1
+}

sbt-dotty/sbt-test/source-dependencies/inline-inherited/build.sbt

@@ -1,3 +1,4 @@
+> recordPreviousIterations
 > run
 
 # Recompile B (no meaningful change, this is just so that the dependencies on A.InnerClass are