From 7f6a2f752d9059ca3d681e54076100e597a8e4ea Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Thu, 2 Feb 2023 17:56:12 +0100 Subject: [PATCH] improvement: Small fixes to allow using Metals with scaladoc with sbt This would require just setting `bspEnabled := true`, but not for sjsJUnitTests which seem to cause inifinite loop of compilations. I also need to work a bit on Bloop to also make it work. This still needs https://github.com/scalameta/metals/pull/4938 --- project/Build.scala | 2 ++ project/build.sbt | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 90f2dc3fe076..097876a63f92 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -360,6 +360,7 @@ object Build { // Settings used when compiling dotty with a non-bootstrapped dotty lazy val commonBootstrappedSettings = commonDottySettings ++ NoBloopExport.settings ++ Seq( + // To enable support of scaladoc and language-server projects you need to change this to true and use sbt as your build server bspEnabled := false, (Compile / unmanagedSourceDirectories) += baseDirectory.value / "src-bootstrapped", @@ -1130,6 +1131,7 @@ object Build { enablePlugins(DottyJSPlugin). dependsOn(`scala3-library-bootstrappedJS`). settings( + bspEnabled := false, scalacOptions --= Seq("-Xfatal-warnings", "-deprecation"), // Required to run Scala.js tests. diff --git a/project/build.sbt b/project/build.sbt index e19492c42022..188dfa5c6702 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,7 +1,4 @@ // Used by VersionUtil to get gitHash and commitDate libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r" - -Compile / unmanagedSourceDirectories += - baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config" libraryDependencies += Dependencies.`jackson-databind`