diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2016-11-22 16:33:53 +0100 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2016-11-22 16:33:53 +0100 |
| commit | 511e06c10ca84dfb7ba159c2e467d929497f3cc0 (patch) | |
| tree | 57ea19279524be696a60f5547d654a27cd6dc47f /project | |
| parent | e01e970b755e01eeb7307832580780f329a7bd57 (diff) | |
| download | dotty-511e06c10ca84dfb7ba159c2e467d929497f3cc0.tar.gz dotty-511e06c10ca84dfb7ba159c2e467d929497f3cc0.tar.bz2 dotty-511e06c10ca84dfb7ba159c2e467d929497f3cc0.zip | |
Fix scripted tests when the dotty artifact is not in cache
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/project/Build.scala b/project/Build.scala index 1fc707bfe..d6d0fdd91 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -84,13 +84,19 @@ object DottyBuild extends Build { /** Projects -------------------------------------------------------------- */ + + // Needed because the dotty project aggregates dotty-sbt-bridge but dotty-sbt-bridge + // currently refers to dotty in its scripted task and "aggregate" does not take by-name + // parameters: https://github.com/sbt/sbt/issues/2200 + lazy val dottySbtBridgeRef = LocalProject("dotty-sbt-bridge") + // The root project: // - aggregates other projects so that "compile", "test", etc are run on all projects at once. // - publishes its own empty artifact "dotty" that depends on "dotty-library" and "dotty-compiler", // this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name lazy val dotty = project.in(file(".")). // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests - aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-sbt-bridge`, `scala-library`). + aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, dottySbtBridgeRef, `scala-library`). dependsOn(`dotty-compiler`). dependsOn(`dotty-library`). settings( @@ -428,9 +434,10 @@ object DottyBuild extends Build { ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"), ScriptedPlugin.scriptedBufferLog := false, ScriptedPlugin.scripted := { - val x1 = (publishLocal in `dotty-compiler`).value - val x2 = (publishLocal in `dotty-library`).value - val x3 = (publishLocal in `dotty-interfaces`).value + val x1 = (publishLocal in `dotty-interfaces`).value + val x2 = (publishLocal in `dotty-compiler`).value + val x3 = (publishLocal in `dotty-library`).value + val x4 = (publishLocal in dotty).value // Needed because sbt currently hardcodes the dotty artifact ScriptedPlugin.scriptedTask.evaluated } // TODO: Use this instead of manually copying DottyInjectedPlugin.scala |