Skip to content

fix the dependencies of the bootstrapped stdlib #24379

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 4 commits into from
Nov 12, 2025
+9 −9
Merged

fix the dependencies of the bootstrapped stdlib #24379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc5c608
fix: fix the dependencies of the bootstrapped stdlib
hamzaremmal Nov 11, 2025
be8547a
fix: exclude the transitive dependency to `scala3-library` in `scala3…
hamzaremmal Nov 12, 2025
39a41cb
fix: Scala.js stdlib should not have an artifact name ending with `_s…
hamzaremmal Nov 12, 2025
e1953d8
chore: disable `fs2`, it suffers from #22890
hamzaremmal Nov 12, 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
2 changes: 1 addition & 1 deletion community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class CommunityBuildTestB:
@Test def discipline = projects.discipline.run()
@Test def disciplineMunit = projects.disciplineMunit.run()
@Test def disciplineSpecs2 = projects.disciplineSpecs2.run()
@Test def fs2 = projects.fs2.run()
//@Test def fs2 = projects.fs2.run()
@Test def monocle = projects.monocle.run()
@Test def munit = projects.munit.run()
@Test def munitCatsEffect = projects.munitCatsEffect.run()
Expand Down
16 changes: 8 additions & 8 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,6 +2007,7 @@ object Build {
// (not the actual version we use to compile the project)
scalaVersion := referenceVersion,
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)
Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src"),
Compile / unmanagedSourceDirectories += baseDirectory.value / "src-bootstrapped",
Expand All @@ -2031,10 +2032,8 @@ object Build {
publish / skip := false,
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala-library-bootstrapped",
// we need to have the `scala-library` artifact in the classpath for `ScalaLibraryPlugin` to work
// this was the only way to not get the artifact evicted by sbt. Even a custom configuration didn't work
// NOTE: true is the default value, just making things clearer here
managedScalaInstance := true,
// we do not need sbt to create a managed instance for us, we do it manually in the next setting
managedScalaInstance := false,
// Configure the nonbootstrapped compiler
scalaInstance := {
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
Expand Down Expand Up @@ -2142,6 +2141,7 @@ object Build {
// because we allow cross-compilation.
versionScheme := Some("always"),
crossPaths := false,
crossVersion := CrossVersion.disabled,
Copy link
Member Author

@hamzaremmal hamzaremmal Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sjrd seems we have broken the artifact name on October 8th when we added the DottyJSPlugin to this project. This here fixes it but is it the correct way?

See the nightly releases: https://repo.scala-lang.org/ui/repos/tree/General/local-maven-nightlies/org/scala-js/scalajs-scalalib_2.13_sjs1_3/3.8.0-RC1-bin-20251008-6194563-NIGHTLY.

Copy link
Member

@sjrd sjrd Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be right way, yes.

// 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,
Expand Down Expand Up @@ -2192,10 +2192,7 @@ object Build {
libraryDependencies += ("org.scala-js" % "scalajs-javalib" % scalaJSVersion),
// Project specific target folder. sbt doesn't like having two projects using the same target folder
target := target.value / "scala-library",
// we need to have the `scala-library` artifact in the classpath for `ScalaLibraryPlugin` to work
// this was the only way to not get the artifact evicted by sbt. Even a custom configuration didn't work
// NOTE: true is the default value, just making things clearer here
managedScalaInstance := true,
managedScalaInstance := false,
autoScalaLibrary := false,
// Configure the nonbootstrapped compiler
scalaInstance := {
Expand Down Expand Up @@ -3019,6 +3016,9 @@ object Build {
),
// Work around https://github.com/eclipse/lsp4j/issues/295
dependencyOverrides += "org.eclipse.xtend" % "org.eclipse.xtend.lib" % "2.16.0",
// Exclude the dependency that is resolved transively, the stdlib
// is a project dependency instead
excludeDependencies += "org.scala-lang" %% "scala3-library",
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
).
settings(
Expand Down
Loading