Skip to content

Commit 601b78f

Browse files
committed
remove old aggregates
1 parent a749656 commit 601b78f

File tree

2 files changed

+2
-49
lines changed

2 files changed

+2
-49
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
val scala3 = Build.scala3
1+
// Aggregate projects
22
val `scala3-nonbootstrapped` = Build.`scala3-nonbootstrapped`
3-
val `scala3-bootstrapped` = Build.`scala3-bootstrapped`
43
val `scala3-bootstrapped-new` = Build.`scala3-bootstrapped-new`
4+
55
val `scala3-interfaces` = Build.`scala3-interfaces`
66
val `scala3-compiler` = Build.`scala3-compiler`
77
val `scala3-compiler-nonbootstrapped` = Build.`scala3-compiler-nonbootstrapped`

project/Build.scala

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -639,13 +639,6 @@ object Build {
639639
// the compiler classpath, not the JVM classpath.
640640
(dottyCompilerBootstrappedRef / Runtime / externalDependencyClasspath)
641641

642-
// The root project:
643-
// - aggregates other projects so that "compile", "test", etc are run on all projects at once.
644-
// - publishes its own empty artifact "dotty" that depends on "scala3-library" and "scala3-compiler",
645-
// this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name
646-
lazy val scala3 = project.in(file(".")).asDottyRoot(NonBootstrapped)
647-
lazy val `scala3-bootstrapped` = project.asDottyRoot(Bootstrapped)
648-
649642
lazy val `scala3-interfaces` = project.in(file("interfaces")).
650643
settings(commonJavaSettings).
651644
settings(commonMiMaSettings).
@@ -3647,46 +3640,6 @@ object Build {
36473640

36483641
implicit class ProjectDefinitions(val project: Project) extends AnyVal {
36493642

3650-
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
3651-
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
3652-
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3653-
bootstrappedAggregate(`scala3-language-server`, scaladoc, `scala3-presentation-compiler`).
3654-
dependsOn(tastyCore).
3655-
dependsOn(dottyCompiler).
3656-
dependsOn(dottyLibrary).
3657-
bootstrappedSettings(
3658-
addCommandAlias("clean", ";scala3-bootstrapped/clean"),
3659-
).
3660-
nonBootstrappedSettings(
3661-
addCommandAlias("run", "scala3-compiler/run"),
3662-
// Clean everything by default
3663-
addCommandAlias("clean", ";scala3/clean;scala3-bootstrapped/clean"),
3664-
// `publishLocal` on the non-bootstrapped compiler does not produce a
3665-
// working distribution (it can't in general, since there's no guarantee
3666-
// that the non-bootstrapped library is compatible with the
3667-
// non-bootstrapped compiler), so publish the bootstrapped one by
3668-
// default.
3669-
addCommandAlias("publishLocal", "scala3-bootstrapped/publishLocal"),
3670-
buildQuick := {
3671-
val _ = (`scala3-compiler` / Compile / compile).value
3672-
val cp = (`scala3-compiler` / Compile / fullClasspath).value.map(_.data.getAbsolutePath).mkString(File.pathSeparator)
3673-
IO.write(baseDirectory.value / "bin" / ".cp", cp)
3674-
},
3675-
(Compile / console) := (Compile / console).dependsOn(Def.task {
3676-
import _root_.scala.io.AnsiColor._
3677-
val msg = "`console` uses the reference Scala version. Use `repl` instead."
3678-
val f = "" * (msg.length + 2)
3679-
val box =
3680-
s"""$f
3681-
|║ ${BOLD}$msg$RESET
3682-
|╚$f""".stripMargin
3683-
streams.value.log.warn(box)
3684-
}).value,
3685-
).
3686-
settings(
3687-
publish / skip := true
3688-
)
3689-
36903643
def asDottyCompiler(implicit mode: Mode): Project = project.withCommonSettings.
36913644
dependsOn(`scala3-interfaces`).
36923645
dependsOn(dottyLibrary).

0 commit comments

Comments
 (0)