@@ -84,13 +84,19 @@ object DottyBuild extends Build {
84
84
85
85
86
86
/** Projects -------------------------------------------------------------- */
87
+
88
+ // Needed because the dotty project aggregates dotty-sbt-bridge but dotty-sbt-bridge
89
+ // currently refers to dotty in its scripted task and "aggregate" does not take by-name
90
+ // parameters: https://github.com/sbt/sbt/issues/2200
91
+ lazy val dottySbtBridgeRef = LocalProject (" dotty-sbt-bridge" )
92
+
87
93
// The root project:
88
94
// - aggregates other projects so that "compile", "test", etc are run on all projects at once.
89
95
// - publishes its own empty artifact "dotty" that depends on "dotty-library" and "dotty-compiler",
90
96
// this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name
91
97
lazy val dotty = project.in(file(" ." )).
92
98
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
93
- aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-sbt-bridge` , `scala-library`).
99
+ aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, dottySbtBridgeRef , `scala-library`).
94
100
dependsOn(`dotty-compiler`).
95
101
dependsOn(`dotty-library`).
96
102
settings(
@@ -428,9 +434,10 @@ object DottyBuild extends Build {
428
434
ScriptedPlugin .scriptedLaunchOpts := Seq (" -Xmx1024m" ),
429
435
ScriptedPlugin .scriptedBufferLog := false ,
430
436
ScriptedPlugin .scripted := {
431
- val x1 = (publishLocal in `dotty-compiler`).value
432
- val x2 = (publishLocal in `dotty-library`).value
433
- val x3 = (publishLocal in `dotty-interfaces`).value
437
+ val x1 = (publishLocal in `dotty-interfaces`).value
438
+ val x2 = (publishLocal in `dotty-compiler`).value
439
+ val x3 = (publishLocal in `dotty-library`).value
440
+ val x4 = (publishLocal in dotty).value // Needed because sbt currently hardcodes the dotty artifact
434
441
ScriptedPlugin .scriptedTask.evaluated
435
442
}
436
443
// TODO: Use this instead of manually copying DottyInjectedPlugin.scala
0 commit comments