Skip to content

Commit 2961f69

Browse files
authored
Merge pull request #11687 from adpi2/bsp
Disable BSP in Jmh and vscode-dotty
2 parents a147975 + 53bbf2d commit 2961f69

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

project/Build.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ object Build {
348348
)
349349

350350
lazy val commonBenchmarkSettings = Seq(
351+
Jmh / bspEnabled := false,
351352
mainClass in (Jmh, run) := Some("dotty.tools.benchmarks.Bench"), // custom main for jmh:run
352353
javaOptions += "-DBENCH_COMPILER_CLASS_PATH=" + Attributed.data((fullClasspath in (`scala3-bootstrapped`, Compile)).value).mkString("", File.pathSeparator, ""),
353354
javaOptions += "-DBENCH_CLASS_PATH=" + Attributed.data((fullClasspath in (`scala3-library-bootstrapped`, Compile)).value).mkString("", File.pathSeparator, "")
@@ -1236,6 +1237,7 @@ object Build {
12361237
version := "0.1.17-snapshot", // Keep in sync with package.json
12371238
autoScalaLibrary := false,
12381239
publishArtifact := false,
1240+
bspEnabled := false,
12391241
resourceGenerators in Compile += Def.task {
12401242
// Resources that will be copied when bootstrapping a new project
12411243
val buildSbtFile = baseDirectory.value / "out" / "build.sbt"

0 commit comments

Comments
 (0)