Merge pull request scala#11687 from adpi2/bsp

Disable BSP in Jmh and vscode-dotty
wi101 · Mar 10, 2021 · 2961f69 · 2961f69
2 parents a147975 + 53bbf2d
commit 2961f69
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -348,6 +348,7 @@ object Build {
   )
 
   lazy val commonBenchmarkSettings = Seq(
+    Jmh / bspEnabled := false,
     mainClass in (Jmh, run) := Some("dotty.tools.benchmarks.Bench"), // custom main for jmh:run
     javaOptions += "-DBENCH_COMPILER_CLASS_PATH=" + Attributed.data((fullClasspath in (`scala3-bootstrapped`, Compile)).value).mkString("", File.pathSeparator, ""),
     javaOptions += "-DBENCH_CLASS_PATH=" + Attributed.data((fullClasspath in (`scala3-library-bootstrapped`, Compile)).value).mkString("", File.pathSeparator, "")
@@ -1236,6 +1237,7 @@ object Build {
       version := "0.1.17-snapshot", // Keep in sync with package.json
       autoScalaLibrary := false,
       publishArtifact := false,
+      bspEnabled := false,
       resourceGenerators in Compile += Def.task {
         // Resources that will be copied when bootstrapping a new project
         val buildSbtFile = baseDirectory.value / "out" / "build.sbt"