From 243d7beca96ac03f35b86fb5dcdc73c8bebb0116 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 10 Mar 2021 16:38:14 +0100 Subject: [PATCH 1/2] Disable BSP in Jmh config --- project/Build.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/project/Build.scala b/project/Build.scala index 676f16cd275e..1b86132c5958 100644 --- 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, "") From 53bbf2d92c31cc48dc0c0dec8a095df4dcfb22a2 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 10 Mar 2021 16:39:05 +0100 Subject: [PATCH 2/2] Disable BSP in vscode-dotty project --- project/Build.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/project/Build.scala b/project/Build.scala index 1b86132c5958..38126cca738a 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1237,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"