Skip to content

Commit d01571d

Browse files
hamzaremmalWojciechMazur
authored andcommitted
fix: fix the dependencies of the bootstrapped stdlib
[Cherry-picked dc5c608]
1 parent 5efb27f commit d01571d

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

project/Build.scala

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,6 +2007,7 @@ object Build {
20072007
// (not the actual version we use to compile the project)
20082008
scalaVersion := referenceVersion,
20092009
crossPaths := false, // org.scala-lang:scala-library doesn't have a crosspath
2010+
autoScalaLibrary := false, // DO NOT DEPEND ON THE STDLIB, IT IS THE STDLIB
20102011
// Add the source directories for the stdlib (non-boostrapped)
20112012
Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src"),
20122013
Compile / unmanagedSourceDirectories += baseDirectory.value / "src-bootstrapped",
@@ -2031,10 +2032,8 @@ object Build {
20312032
publish / skip := false,
20322033
// Project specific target folder. sbt doesn't like having two projects using the same target folder
20332034
target := target.value / "scala-library-bootstrapped",
2034-
// we need to have the `scala-library` artifact in the classpath for `ScalaLibraryPlugin` to work
2035-
// this was the only way to not get the artifact evicted by sbt. Even a custom configuration didn't work
2036-
// NOTE: true is the default value, just making things clearer here
2037-
managedScalaInstance := true,
2035+
// we do not need sbt to create a managed instance for us, we do it manually in the next setting
2036+
managedScalaInstance := false,
20382037
// Configure the nonbootstrapped compiler
20392038
scalaInstance := {
20402039
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
@@ -2192,10 +2191,7 @@ object Build {
21922191
libraryDependencies += ("org.scala-js" % "scalajs-javalib" % scalaJSVersion),
21932192
// Project specific target folder. sbt doesn't like having two projects using the same target folder
21942193
target := target.value / "scala-library",
2195-
// we need to have the `scala-library` artifact in the classpath for `ScalaLibraryPlugin` to work
2196-
// this was the only way to not get the artifact evicted by sbt. Even a custom configuration didn't work
2197-
// NOTE: true is the default value, just making things clearer here
2198-
managedScalaInstance := true,
2194+
managedScalaInstance := false,
21992195
autoScalaLibrary := false,
22002196
// Configure the nonbootstrapped compiler
22012197
scalaInstance := {

0 commit comments

Comments
 (0)