Skip to content

Commit c40fb36

Browse files
hamzaremmalWojciechMazur
authored andcommitted
remove old bootstrapped compiler
[Cherry-picked a4760bb]
1 parent 3a66a0b commit c40fb36

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
@@ -662,7 +662,7 @@ object Build {
662662

663663
/** Projects -------------------------------------------------------------- */
664664

665-
val dottyCompilerBootstrappedRef = LocalProject("scala3-compiler-bootstrapped")
665+
val dottyCompilerBootstrappedRef = LocalProject("scala3-compiler-bootstrapped-new")
666666

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

10601060
lazy val Scala3CompilerCoursierTest = config("scala3CompilerCoursierTest") extend Test
1061-
lazy val `scala3-compiler-bootstrapped` = project.in(file("compiler")).asDottyCompiler(Bootstrapped)
1062-
.configs(Scala3CompilerCoursierTest)
1063-
.settings(
1064-
inConfig(Scala3CompilerCoursierTest)(Defaults.testSettings),
1065-
Scala3CompilerCoursierTest / scalaSource := baseDirectory.value / "test-coursier",
1066-
Scala3CompilerCoursierTest / fork := true,
1067-
Scala3CompilerCoursierTest / envVars := Map("DOTTY_BOOTSTRAPPED_VERSION" -> dottyVersion),
1068-
Scala3CompilerCoursierTest / unmanagedClasspath += (Scala3CompilerCoursierTest / scalaSource).value,
1069-
Scala3CompilerCoursierTest / test := ((Scala3CompilerCoursierTest / test) dependsOn (
1070-
publishLocal, // Had to enumarate all deps since calling `scala3-bootstrap` / publishLocal will lead to recursive dependency => stack overflow
1071-
`scala3-interfaces` / publishLocal,
1072-
dottyLibrary(Bootstrapped) / publishLocal,
1073-
tastyCore(Bootstrapped) / publishLocal,
1074-
),
1075-
).value,
1076-
)
10771061

10781062
def dottyCompiler(implicit mode: Mode): Project = mode match {
10791063
case NonBootstrapped => `scala3-compiler`
1080-
case Bootstrapped => `scala3-compiler-bootstrapped`
1064+
case Bootstrapped => `scala3-compiler-bootstrapped-new`
10811065
}
10821066

10831067
// Settings shared between scala3-library, scala3-library-bootstrapped and scala3-library-bootstrappedJS
@@ -2993,7 +2977,7 @@ object Build {
29932977
}
29942978

29952979
lazy val `scala3-presentation-compiler-testcases` = project.in(file("presentation-compiler-testcases"))
2996-
.dependsOn(`scala3-compiler-bootstrapped`)
2980+
.dependsOn(`scala3-compiler-bootstrapped-new`)
29972981
.settings(commonBootstrappedSettings)
29982982

29992983
lazy val `scala3-language-server` = project.in(file("language-server")).
@@ -3009,7 +2993,7 @@ object Build {
30092993
// Exclude the dependency that is resolved transively, the stdlib
30102994
// is a project dependency instead
30112995
excludeDependencies += "org.scala-lang" %% "scala3-library",
3012-
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
2996+
javaOptions := (`scala3-compiler-bootstrapped-new` / javaOptions).value,
30132997
).
30142998
settings(
30152999
ideTestsCompilerVersion := (`scala3-compiler` / version).value,
@@ -3392,7 +3376,7 @@ object Build {
33923376
val generateReferenceDocumentation = inputKey[Unit]("Generate language reference documentation for Scala 3")
33933377

33943378
lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).
3395-
dependsOn(`scala3-compiler-bootstrapped`).
3379+
dependsOn(`scala3-compiler-bootstrapped-new`).
33963380
settings(commonBootstrappedSettings)
33973381

33983382

@@ -3472,7 +3456,7 @@ object Build {
34723456
lazy val scaladoc = project.in(file("scaladoc")).
34733457
configs(SourceLinksIntegrationTest).
34743458
settings(commonBootstrappedSettings).
3475-
dependsOn(`scala3-compiler-bootstrapped`).
3459+
dependsOn(`scala3-compiler-bootstrapped-new`).
34763460
dependsOn(`scala3-tasty-inspector-new`).
34773461
settings(inConfig(SourceLinksIntegrationTest)(Defaults.testSettings)).
34783462
settings(
@@ -3929,7 +3913,6 @@ object Build {
39293913
// non-bootstrapped compiler), so publish the bootstrapped one by
39303914
// default.
39313915
addCommandAlias("publishLocal", "scala3-bootstrapped/publishLocal"),
3932-
repl := (`scala3-compiler-bootstrapped` / repl).value,
39333916
buildQuick := {
39343917
val _ = (`scala3-compiler` / Compile / compile).value
39353918
val cp = (`scala3-compiler` / Compile / fullClasspath).value.map(_.data.getAbsolutePath).mkString(File.pathSeparator)

0 commit comments

Comments
 (0)