Skip to content

Commit a4760bb

Browse files
committed
remove old bootstrapped compiler
1 parent 5fbab5d commit a4760bb

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ val `scala3-interfaces` = Build.`scala3-interfaces`
66
val `scala3-compiler` = Build.`scala3-compiler`
77
val `scala3-compiler-nonbootstrapped` = Build.`scala3-compiler-nonbootstrapped`
88
val `scala3-compiler-bootstrapped-new` = Build.`scala3-compiler-bootstrapped-new`
9-
val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
109
val `scala3-repl` = Build.`scala3-repl`
1110
val `scala-library-sjs` = Build.`scala-library-sjs`
1211
val `scala3-library-sjs` = Build.`scala3-library-sjs`

project/Build.scala

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ object Build {
630630

631631
/** Projects -------------------------------------------------------------- */
632632

633-
val dottyCompilerBootstrappedRef = LocalProject("scala3-compiler-bootstrapped")
633+
val dottyCompilerBootstrappedRef = LocalProject("scala3-compiler-bootstrapped-new")
634634

635635
/** External dependencies we may want to put on the compiler classpath. */
636636
def externalCompilerClasspathTask: Def.Initialize[Task[Def.Classpath]] =
@@ -1026,26 +1026,10 @@ object Build {
10261026
lazy val `scala3-compiler` = project.in(file("compiler")).asDottyCompiler(NonBootstrapped)
10271027

10281028
lazy val Scala3CompilerCoursierTest = config("scala3CompilerCoursierTest") extend Test
1029-
lazy val `scala3-compiler-bootstrapped` = project.in(file("compiler")).asDottyCompiler(Bootstrapped)
1030-
.configs(Scala3CompilerCoursierTest)
1031-
.settings(
1032-
inConfig(Scala3CompilerCoursierTest)(Defaults.testSettings),
1033-
Scala3CompilerCoursierTest / scalaSource := baseDirectory.value / "test-coursier",
1034-
Scala3CompilerCoursierTest / fork := true,
1035-
Scala3CompilerCoursierTest / envVars := Map("DOTTY_BOOTSTRAPPED_VERSION" -> dottyVersion),
1036-
Scala3CompilerCoursierTest / unmanagedClasspath += (Scala3CompilerCoursierTest / scalaSource).value,
1037-
Scala3CompilerCoursierTest / test := ((Scala3CompilerCoursierTest / test) dependsOn (
1038-
publishLocal, // Had to enumarate all deps since calling `scala3-bootstrap` / publishLocal will lead to recursive dependency => stack overflow
1039-
`scala3-interfaces` / publishLocal,
1040-
dottyLibrary(Bootstrapped) / publishLocal,
1041-
tastyCore(Bootstrapped) / publishLocal,
1042-
),
1043-
).value,
1044-
)
10451029

10461030
def dottyCompiler(implicit mode: Mode): Project = mode match {
10471031
case NonBootstrapped => `scala3-compiler`
1048-
case Bootstrapped => `scala3-compiler-bootstrapped`
1032+
case Bootstrapped => `scala3-compiler-bootstrapped-new`
10491033
}
10501034

10511035
// Settings shared between scala3-library, scala3-library-bootstrapped and scala3-library-bootstrappedJS
@@ -2933,7 +2917,7 @@ object Build {
29332917
}
29342918

29352919
lazy val `scala3-presentation-compiler-testcases` = project.in(file("presentation-compiler-testcases"))
2936-
.dependsOn(`scala3-compiler-bootstrapped`)
2920+
.dependsOn(`scala3-compiler-bootstrapped-new`)
29372921
.settings(commonBootstrappedSettings)
29382922

29392923
lazy val `scala3-language-server` = project.in(file("language-server")).
@@ -2949,7 +2933,7 @@ object Build {
29492933
// Exclude the dependency that is resolved transively, the stdlib
29502934
// is a project dependency instead
29512935
excludeDependencies += "org.scala-lang" %% "scala3-library",
2952-
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
2936+
javaOptions := (`scala3-compiler-bootstrapped-new` / javaOptions).value,
29532937
).
29542938
settings(
29552939
ideTestsCompilerVersion := (`scala3-compiler` / version).value,
@@ -3332,7 +3316,7 @@ object Build {
33323316
val generateReferenceDocumentation = inputKey[Unit]("Generate language reference documentation for Scala 3")
33333317

33343318
lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).
3335-
dependsOn(`scala3-compiler-bootstrapped`).
3319+
dependsOn(`scala3-compiler-bootstrapped-new`).
33363320
settings(commonBootstrappedSettings)
33373321

33383322

@@ -3412,7 +3396,7 @@ object Build {
34123396
lazy val scaladoc = project.in(file("scaladoc")).
34133397
configs(SourceLinksIntegrationTest).
34143398
settings(commonBootstrappedSettings).
3415-
dependsOn(`scala3-compiler-bootstrapped`).
3399+
dependsOn(`scala3-compiler-bootstrapped-new`).
34163400
dependsOn(`scala3-tasty-inspector-new`).
34173401
settings(inConfig(SourceLinksIntegrationTest)(Defaults.testSettings)).
34183402
settings(
@@ -3869,7 +3853,6 @@ object Build {
38693853
// non-bootstrapped compiler), so publish the bootstrapped one by
38703854
// default.
38713855
addCommandAlias("publishLocal", "scala3-bootstrapped/publishLocal"),
3872-
repl := (`scala3-compiler-bootstrapped` / repl).value,
38733856
buildQuick := {
38743857
val _ = (`scala3-compiler` / Compile / compile).value
38753858
val cp = (`scala3-compiler` / Compile / fullClasspath).value.map(_.data.getAbsolutePath).mkString(File.pathSeparator)

0 commit comments

Comments
 (0)