Skip to content

Commit eeccf36

Browse files
hamzaremmalWojciechMazur
authored andcommitted
remove old aggregates
[Cherry-picked 601b78f]
1 parent fea61fd commit eeccf36

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
@@ -671,13 +671,6 @@ object Build {
671671
// the compiler classpath, not the JVM classpath.
672672
(dottyCompilerBootstrappedRef / Runtime / externalDependencyClasspath)
673673

674-
// The root project:
675-
// - aggregates other projects so that "compile", "test", etc are run on all projects at once.
676-
// - publishes its own empty artifact "dotty" that depends on "scala3-library" and "scala3-compiler",
677-
// this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name
678-
lazy val scala3 = project.in(file(".")).asDottyRoot(NonBootstrapped)
679-
lazy val `scala3-bootstrapped` = project.asDottyRoot(Bootstrapped)
680-
681674
lazy val `scala3-interfaces` = project.in(file("interfaces")).
682675
settings(commonJavaSettings).
683676
settings(commonMiMaSettings).
@@ -3707,46 +3700,6 @@ object Build {
37073700

37083701
implicit class ProjectDefinitions(val project: Project) extends AnyVal {
37093702

3710-
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
3711-
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
3712-
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3713-
bootstrappedAggregate(`scala3-language-server`, scaladoc, `scala3-presentation-compiler`).
3714-
dependsOn(tastyCore).
3715-
dependsOn(dottyCompiler).
3716-
dependsOn(dottyLibrary).
3717-
bootstrappedSettings(
3718-
addCommandAlias("clean", ";scala3-bootstrapped/clean"),
3719-
).
3720-
nonBootstrappedSettings(
3721-
addCommandAlias("run", "scala3-compiler/run"),
3722-
// Clean everything by default
3723-
addCommandAlias("clean", ";scala3/clean;scala3-bootstrapped/clean"),
3724-
// `publishLocal` on the non-bootstrapped compiler does not produce a
3725-
// working distribution (it can't in general, since there's no guarantee
3726-
// that the non-bootstrapped library is compatible with the
3727-
// non-bootstrapped compiler), so publish the bootstrapped one by
3728-
// default.
3729-
addCommandAlias("publishLocal", "scala3-bootstrapped/publishLocal"),
3730-
buildQuick := {
3731-
val _ = (`scala3-compiler` / Compile / compile).value
3732-
val cp = (`scala3-compiler` / Compile / fullClasspath).value.map(_.data.getAbsolutePath).mkString(File.pathSeparator)
3733-
IO.write(baseDirectory.value / "bin" / ".cp", cp)
3734-
},
3735-
(Compile / console) := (Compile / console).dependsOn(Def.task {
3736-
import _root_.scala.io.AnsiColor._
3737-
val msg = "`console` uses the reference Scala version. Use `repl` instead."
3738-
val f = "" * (msg.length + 2)
3739-
val box =
3740-
s"""$f
3741-
|║ ${BOLD}$msg$RESET
3742-
|╚$f""".stripMargin
3743-
streams.value.log.warn(box)
3744-
}).value,
3745-
).
3746-
settings(
3747-
publish / skip := true
3748-
)
3749-
37503703
def asDottyCompiler(implicit mode: Mode): Project = project.withCommonSettings.
37513704
dependsOn(`scala3-interfaces`).
37523705
dependsOn(dottyLibrary).

0 commit comments

Comments
 (0)