Merge pull request #126 from alexarchambault/merge-upstream

alexarchambault · web-flow · commit b650220f9f54 · 2023-03-27T15:30:17.000+02:00
Merge upstream changes
diff --git a/.github/setup-test-projects.sh b/.github/setup-test-projects.sh
@@ -6,7 +6,7 @@ cd frontend/src/test/resources/
 for d in *; do
   if test -f "$d/build.sbt"; then
     cd "$d"
-    sbt bloopInstall
+    sbt "-DbloopVersion=1.4.11-9-827a32e7" bloopInstall
     cd -
   fi
 done
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,5 @@
 import build.BuildImplementation.BuildDefaults
+import build.BuildImplementation.jvmOptions
 import scala.util.Properties
 
 inThisBuild(
@@ -57,10 +58,10 @@ val scalafixSettings: Seq[Setting[_]] = Seq(
 )
 
 lazy val shared = project
-  .settings(scalafixSettings)
   .settings(
     sonatypeSetting,
     name := "bloop-shared",
+    scalafixSettings,
     libraryDependencies ++= Seq(
       Dependencies.jsoniterCore,
       Dependencies.jsoniterMacros,
@@ -80,12 +81,12 @@ import build.Dependencies
 
 lazy val backend = project
   .enablePlugins(BuildInfoPlugin)
-  .settings(scalafixSettings)
-  .settings(testSettings ++ testSuiteSettings)
   .dependsOn(shared)
   .settings(
     sonatypeSetting,
     name := "bloop-backend",
+    scalafixSettings,
+    testSettings ++ testSuiteSettings,
     buildInfoPackage := "bloop.internal.build",
     buildInfoKeys := Seq[BuildInfoKey](
       Keys.scalaVersion,
@@ -95,7 +96,7 @@ lazy val backend = project
     libraryDependencies ++= List(
       Dependencies.nailgun,
       Dependencies.scalazCore,
-      Dependencies.scalazConcurrent,
+      Dependencies.coursierInterface,
       Dependencies.libraryManagement,
       Dependencies.sourcecode,
       Dependencies.monix,
@@ -129,7 +130,6 @@ lazy val tmpDirSettings = Def.settings(
   }
 )
 
-import build.BuildImplementation.jvmOptions
 // For the moment, the dependency is fixed
 lazy val frontend: Project = project
   .dependsOn(
@@ -138,27 +138,9 @@ lazy val frontend: Project = project
   )
   .enablePlugins(BuildInfoPlugin)
   .configs(IntegrationTest)
-  .settings(scalafixSettings)
   .settings(
     sonatypeSetting,
-    testSettings,
-    testSuiteSettings,
-    Defaults.itSettings,
     BuildDefaults.frontendTestBuildSettings,
-    (Test / unmanagedResources / includeFilter) := {
-      new FileFilter {
-        def accept(file: File): Boolean = {
-          val abs = file.getAbsolutePath
-          !(
-            abs.contains("scala-2.12") ||
-              abs.contains("classes-") ||
-              abs.contains("target")
-          )
-        }
-      }
-    }
-  )
-  .settings(
     name := "bloop-frontend",
     bloopName := "bloop",
     (Compile / run / mainClass) := Some("bloop.Cli"),
@@ -192,16 +174,16 @@ lazy val frontend: Project = project
       Dependencies.logback
     )
   )
+  .disablePlugins(ScalafixPlugin)
 
 val jsBridge1Name = "bloop-js-bridge-1"
 lazy val jsBridge1 = project
   .dependsOn(frontend % Provided, frontend % "test->test")
   .in(file("bridges") / "scalajs-1")
-  .disablePlugins(ScalafixPlugin)
-  .settings(testSettings)
   .settings(
     sonatypeSetting,
     name := jsBridge1Name,
+    testSettings,
     libraryDependencies ++= List(
       Dependencies.scalaJsLinker1,
       Dependencies.scalaJsLogging1,
@@ -217,10 +199,10 @@ lazy val nativeBridge04 = project
   .dependsOn(frontend % Provided, frontend % "test->test")
   .in(file("bridges") / "scala-native-0.4")
   .disablePlugins(ScalafixPlugin)
-  .settings(testSettings)
   .settings(
     sonatypeSetting,
     name := nativeBridge04Name,
+    testSettings,
     libraryDependencies += Dependencies.scalaNativeTools04,
     (Test / javaOptions) ++= jvmOptions,
     (Test / fork) := true
diff --git a/frontend/src/main/scala/bloop/data/Project.scala b/frontend/src/main/scala/bloop/data/Project.scala
@@ -28,6 +28,7 @@ import com.typesafe.config.ConfigException
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigParseOptions
 import com.typesafe.config.ConfigSyntax
+import scalaz.Cord
 import xsbti.compile.ClasspathOptions
 import xsbti.compile.CompileOrder
 
@@ -274,7 +275,10 @@ final case class Project(
 object Project {
   private implicit val filter: DebugFilter.All.type = DebugFilter.All
   final implicit val ps: scalaz.Show[Project] =
-    new scalaz.Show[Project] { override def shows(f: Project): String = f.name }
+    new scalaz.Show[Project] {
+      override def shows(f: Project): String = f.name
+      override def show(f: Project): Cord = Cord(shows(f))
+    }
 
   final class ProjectReadException(msg: String, cause: Throwable)
       extends RuntimeException(msg, cause)
diff --git a/frontend/src/main/scala/bloop/engine/tasks/compilation/CompileResult.scala b/frontend/src/main/scala/bloop/engine/tasks/compilation/CompileResult.scala
@@ -10,6 +10,8 @@ import bloop.reporter.Problem
 import bloop.task.Task
 import bloop.util.CacheHashCode
 
+import scalaz.Cord
+
 sealed trait CompileResult[+R] {
   def result: R
 }
@@ -134,5 +136,6 @@ object FinalCompileResult {
           }
       }
     }
+    override def show(f: FinalCompileResult): Cord = Cord(shows(f))
   }
 }
diff --git a/frontend/src/test/resources/compiler-plugin-allowlist/project/plugins.sbt b/frontend/src/test/resources/compiler-plugin-allowlist/project/plugins.sbt
@@ -4,5 +4,11 @@ addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.3.7")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.1")
 addSbtPlugin("com.softwaremill.clippy" % "plugin-sbt" % "0.5.3")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/plugins.sbt b/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/plugins.sbt
@@ -1,5 +1,11 @@
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/plugins.sbt b/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/plugins.sbt
@@ -1,5 +1,11 @@
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/plugins.sbt b/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/plugins.sbt
@@ -1,5 +1,10 @@
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/plugins.sbt b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/plugins.sbt
@@ -1,5 +1,11 @@
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/custom-test-framework/project/plugins.sbt b/frontend/src/test/resources/custom-test-framework/project/plugins.sbt
@@ -1,2 +1,8 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/no-test-frameworks/project/plugins.sbt b/frontend/src/test/resources/no-test-frameworks/project/plugins.sbt
@@ -1,2 +1,8 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/scala-seed-project/project/plugins.sbt b/frontend/src/test/resources/scala-seed-project/project/plugins.sbt
@@ -1,2 +1,8 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/resources/simple-build/project/plugins.sbt b/frontend/src/test/resources/simple-build/project/plugins.sbt
@@ -1,2 +1,8 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11-9-827a32e7")
+val pluginVersion = sys.props.getOrElse(
+  "bloopVersion",
+  throw new RuntimeException("Unable to find -DbloopVersion")
+)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % pluginVersion)
+
 updateOptions := updateOptions.value.withLatestSnapshots(false)
diff --git a/frontend/src/test/scala/bloop/util/TestUtil.scala b/frontend/src/test/scala/bloop/util/TestUtil.scala
@@ -21,6 +21,7 @@ import bloop.bsp.BloopRpcServices
 import bloop.cli.Commands
 import bloop.config.Config
 import bloop.config.Config.CompileOrder
+import bloop.config.Tag
 import bloop.data.JdkConfig
 import bloop.data.LoadedProject
 import bloop.data.Origin
@@ -49,7 +50,6 @@ import bloop.logging.RecordingLogger
 
 import _root_.bloop.task.Task
 import _root_.monix.execution.Scheduler
-import bloop.config.Tag
 import org.junit.Assert
 import sbt.internal.inc.BloopComponentCompiler
 import java.util.concurrent.TimeoutException
diff --git a/project/BuildPlugin.scala b/project/BuildPlugin.scala
@@ -2,19 +2,7 @@ package build
 
 import java.io.File
 
-import sbt.{
-  AutoPlugin,
-  BuildPaths,
-  Def,
-  Keys,
-  PluginTrigger,
-  Plugins,
-  State,
-  Task,
-  ThisBuild,
-  uri,
-  Reference
-}
+import sbt._
 import sbt.io.syntax.fileToRichFile
 import sbt.librarymanagement.syntax.stringToOrganization
 import sbt.util.FileFunction
@@ -39,8 +27,6 @@ object BuildPlugin extends AutoPlugin {
 }
 
 object BuildKeys {
-  import sbt.{RootProject, ProjectRef, BuildRef, file, uri}
-
   def inProject(ref: Reference)(ss: Seq[Def.Setting[_]]): Seq[Def.Setting[_]] =
     sbt.inScope(sbt.ThisScope.in(project = ref))(ss)
 
@@ -78,8 +64,6 @@ object BuildKeys {
 }
 
 object BuildImplementation {
-  import sbt.{url, file}
-  import sbt.{Developer, Resolver, Watched, Compile, Test}
   import sbtdynver.DynVerPlugin.{autoImport => DynVerKeys}
 
   // This should be added to upstream sbt.
@@ -115,8 +99,6 @@ object BuildImplementation {
     )
   )
 
-  import sbt.CrossVersion
-
   final val projectSettings: Seq[Def.Setting[_]] = Seq(
     Keys.scalacOptions := {
       CrossVersion.partialVersion(Keys.scalaVersion.value) match {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -1,5 +1,8 @@
 package build
 
+import sbt.librarymanagement.syntax.stringToOrganization
+import sbt.Provided
+
 object Dependencies {
   val Scala212Version = "2.12.17"
   val Scala213Version = "2.13.8"
@@ -9,7 +12,7 @@ object Dependencies {
 
   val bspVersion = "2.1.0-M3"
 
-  val scalazVersion = "7.2.35"
+  val scalazVersion = "7.3.7"
   val lmVersion = "1.8.0"
   val caseAppVersion = "2.0.6"
   val sourcecodeVersion = "0.3.0"
@@ -31,9 +34,8 @@ object Dependencies {
   val snailgunVersion = "0.4.1-sc2"
   val debugAdapterVersion = "3.0.5"
   val bloopConfigVersion = "1.5.5"
-  val coursierInterfaceVersion = "1.0.7"
+  val coursierInterfaceVersion = "1.0.12"
 
-  import sbt.librarymanagement.syntax.stringToOrganization
   val zinc = "org.scala-sbt" %% "zinc" % zincVersion
   val bsp4s = "ch.epfl.scala" %% "bsp4s" % bspVersion
   val nailgun = "io.github.alexarchambault.bleep" % "nailgun-server" % "1.0.4"
@@ -42,7 +44,6 @@ object Dependencies {
   val libraryManagement = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
   val log4j = "org.apache.logging.log4j" % "log4j-core" % "2.19.0"
   val scalazCore = "org.scalaz" %% "scalaz-core" % scalazVersion
-  val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % scalazVersion
   val coursierInterface = "io.get-coursier" % "interface" % coursierInterfaceVersion
   val caseApp = "com.github.alexarchambault" %% "case-app" % caseAppVersion
   val sourcecode = "com.lihaoyi" %% "sourcecode" % sourcecodeVersion
@@ -52,13 +53,10 @@ object Dependencies {
 
   val utest = "com.lihaoyi" %% "utest" % "0.8.1"
   val pprint = "com.lihaoyi" %% "pprint" % "0.8.1"
-  val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.3"
   val junit = "com.github.sbt" % "junit-interface" % junitVersion
   val directoryWatcher = "ch.epfl.scala" % "directory-watcher" % directoryWatcherVersion
   val difflib = "com.googlecode.java-diff-utils" % "diffutils" % difflibVersion
 
-  import sbt.Provided
-
   val monix = "io.monix" %% "monix" % monixVersion
   val jsoniterCore =
     "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % jsoniterVersion
diff --git a/project/build.sbt b/project/build.sbt
@@ -9,7 +9,7 @@ addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9")
 
 libraryDependencies ++= List(
-  "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.1.202206130422-r",
-  "org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "5.13.1.202206130422-r",
+  "org.eclipse.jgit" % "org.eclipse.jgit" % "6.4.0.202211300538-r",
+  "org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "6.4.0.202211300538-r",
   "commons-codec" % "commons-codec" % "1.15"
 )

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ import bloop.reporter.Problem`
`10`	`10`	`import bloop.task.Task`
`11`	`11`	`import bloop.util.CacheHashCode`
`12`	`12`
	`13`	`+import scalaz.Cord`
	`14`	`+`
`13`	`15`	`sealed trait CompileResult[+R] {`
`14`	`16`	`def result: R`
`15`	`17`	`}`
`@@ -134,5 +136,6 @@ object FinalCompileResult {`
`134`	`136`	`}`
`135`	`137`	`}`
`136`	`138`	`}`
	`139`	`+ override def show(f: FinalCompileResult): Cord = Cord(shows(f))`
`137`	`140`	`}`
`138`	`141`	`}`