Skip to content

Some tweaks to BSP in the build #24483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 19, 2025
+22 −12
Merged

Some tweaks to BSP in the build #24483

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
581cef9
fix: set the `classDirectory` in `scala3-library` to the one in `scal…
hamzaremmal Nov 19, 2025
bb08459
fix: missing tweaks to `bspEnabled` in the build
hamzaremmal Nov 19, 2025
1ea06a4
fix: update scala version of each project
hamzaremmal Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@ object Build {
moduleName := "scala3-staging",
version := dottyVersion,
versionScheme := Some("semver-spec"),
scalaVersion := referenceVersion,
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true, // org.scala-lang:scala3-staging has a crosspath
autoScalaLibrary := false, // do not add a dependency to stdlib, we depend transitively on the stdlib from `scala3-compiler-bootstrapped`
// Add the source directories for the sbt-bridge (boostrapped)
Expand All @@ -995,6 +995,7 @@ object Build {
Test / publishArtifact := false,
publish / skip := false,
// Configure to use the non-bootstrapped compiler
managedScalaInstance := false,
scalaInstance := {
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet

Expand Down Expand Up @@ -1035,7 +1036,7 @@ object Build {
moduleName := "scala3-tasty-inspector",
version := dottyVersion,
versionScheme := Some("semver-spec"),
scalaVersion := referenceVersion,
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true, // org.scala-lang:scala3-tasty-inspector has a crosspath
autoScalaLibrary := false, // do not add a dependency to stdlib, we depend transitively on the stdlib from `scala3-compiler-bootstrapped`
// Add the source directories for the sbt-bridge (boostrapped)
Expand All @@ -1050,6 +1051,7 @@ object Build {
Test / publishArtifact := false,
publish / skip := false,
// Configure to use the non-bootstrapped compiler
managedScalaInstance := false,
scalaInstance := {
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet

Expand Down Expand Up @@ -1086,7 +1088,7 @@ object Build {
moduleName := "scala3-repl",
version := dottyVersion,
versionScheme := Some("semver-spec"),
scalaVersion := referenceVersion,
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true,
autoScalaLibrary := false,
// Add the source directories for the sbt-bridge (boostrapped)
Expand All @@ -1113,6 +1115,7 @@ object Build {
"org.virtuslab" % "using_directives" % "1.1.4", // used by the REPL for parsing magic comments
),
// Configure to use the non-bootstrapped compiler
managedScalaInstance := false,
scalaInstance := {
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet

Expand Down Expand Up @@ -1173,6 +1176,7 @@ object Build {
// with it as a parameter. THIS IS NOT A LEGIT USE CASE OF THE `-usejavacp` FLAG.
(Compile / run).toTask(" -usejavacp").value
},
bspEnabled := false,
)

// ==============================================================================================
Expand Down Expand Up @@ -1251,6 +1255,8 @@ object Build {
Test / doc := (`scala-library-nonbootstrapped` / Test / doc).value,
Test / run := (`scala-library-nonbootstrapped` / Test / run).evaluated,
Test / test := (`scala-library-nonbootstrapped` / Test / test).value,
// Claim that the classes generated by this project are the same as the one we get from `scala-library-nonbootstrapped`
Compile / classDirectory := (`scala-library-nonbootstrapped` / Compile / classDirectory).value,
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := false,
Expand All @@ -1261,7 +1267,6 @@ object Build {
publish / skip := false,
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala3-library-nonbootstrapped",
bspEnabled := false,
)

/* Configuration of the org.scala-lang:scala-library:*.**.**-bootstrapped project */
Expand All @@ -1281,7 +1286,7 @@ object Build {
versionScheme := Some("always"),
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
// (not the actual version we use to compile the project)
scalaVersion := referenceVersion,
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := false, // org.scala-lang:scala-library doesn't have a crosspath
autoScalaLibrary := false, // DO NOT DEPEND ON THE STDLIB, IT IS THE STDLIB
// Add the source directories for the stdlib (non-boostrapped)
Expand Down Expand Up @@ -1353,7 +1358,7 @@ object Build {
versionScheme := Some("semver-spec"),
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
// (not the actual version we use to compile the project)
scalaVersion := referenceVersion,
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true, // org.scala-lang:scala3-library has a crosspath
// Do not depend on the `org.scala-lang:scala3-library` automatically, we manually depend on `scala-library-bootstrapped`
autoScalaLibrary := false,
Expand All @@ -1371,6 +1376,8 @@ object Build {
Test / compile := (`scala-library-bootstrapped` / Test / compile).value,
Test / doc := (`scala-library-bootstrapped` / Test / doc).value,
Test / run := (`scala-library-bootstrapped` / Test / run).evaluated,
// Claim that the classes generated by this project are the same as the one we get from `scala-library-bootstrapped`
Compile / classDirectory := (`scala-library-bootstrapped` / Compile / classDirectory).value,
// Packaging configuration of the stdlib
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := false,
Expand Down Expand Up @@ -1411,7 +1418,7 @@ object Build {
crossVersion := CrossVersion.disabled,
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
// (not the actual version we use to compile the project)
scalaVersion := referenceVersion,
scalaVersion := dottyNonBootstrappedVersion,
// Add the source directories for the stdlib (non-boostrapped)
Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src"),
Compile / unmanagedSourceDirectories ++=
Expand Down Expand Up @@ -1524,7 +1531,7 @@ object Build {
versionScheme := Some("semver-spec"),
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
// (not the actual version we use to compile the project)
scalaVersion := referenceVersion,
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true, // org.scala-lang:scala3-library_sjs1 has a crosspath
// Do not depend on the `org.scala-lang:scala3-library` automatically, we manually depend on `scala-library-bootstrapped`
autoScalaLibrary := false,
Expand Down Expand Up @@ -1626,7 +1633,7 @@ object Build {
moduleName := "tasty-core",
version := dottyVersion,
versionScheme := Some("semver-spec"),
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true, // org.scala-lang:tasty-core has a crosspath
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
autoScalaLibrary := false,
Expand All @@ -1649,6 +1656,7 @@ object Build {
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "tasty-core-bootstrapped",
// Configure to use the non-bootstrapped compiler
managedScalaInstance := false,
scalaInstance := {
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet

Expand Down Expand Up @@ -1696,7 +1704,7 @@ object Build {
moduleName := "scala3-compiler",
version := dottyNonBootstrappedVersion,
versionScheme := Some("semver-spec"),
scalaVersion := dottyNonBootstrappedVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
crossPaths := true, // org.scala-lang:scala3-compiler has a crosspath
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
autoScalaLibrary := false,
Expand Down Expand Up @@ -1839,7 +1847,7 @@ object Build {
moduleName := "scala3-compiler",
version := dottyVersion,
versionScheme := Some("semver-spec"),
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true, // org.scala-lang:scala3-compiler has a crosspath
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
autoScalaLibrary := false,
Expand Down Expand Up @@ -1990,7 +1998,7 @@ object Build {
moduleName := "scaladoc",
version := dottyVersion,
versionScheme := Some("semver-spec"),
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
scalaVersion := dottyNonBootstrappedVersion,
crossPaths := true, // org.scala-lang:scaladoc has a crosspath
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
autoScalaLibrary := false,
Expand Down Expand Up @@ -2024,6 +2032,7 @@ object Build {
BuildInfoPlugin.buildInfoScopedSettings(Compile),
BuildInfoPlugin.buildInfoDefaultSettings,
// Configure to use the non-bootstrapped compiler
managedScalaInstance := false,
scalaInstance := {
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet

Expand Down Expand Up @@ -2219,6 +2228,7 @@ object Build {
Test / fork := false,

scalaJSUseMainModuleInitializer := true,
bspEnabled := false,
)

/** Scala.js test suite.
Expand Down
Loading