Update Build.scala to always use dotty-library-bootstraped

I couldn't get rid of the `dotty-library` project completely, it's still used the first time sbt-briged is compiled with dotty. The dependencies are as follows:

- (no dep) compile `dotty-compile` with scalac [0]
- (no dep) compile `dotty-library` with scalac [1]
- ([0], [1]) → compile `dotty-sbt-bridge` with dotty [2]
- ([0], [2]) → compile `dotty-library-bootstraped` with dotty + sbt

After that, [1] should never be used again.

Author: OlivierBlanvillain

bin/common

@@ -90,7 +90,13 @@ function build_all {
     printf "done\n"
 
     printf "Building dotty library..."
-    DOTTY_LIB_JAR=$(build_jar dotty-library/package "library/target/scala-$SCALA_BINARY_VERSION")
+
+    cd "$DOTTY_ROOT" >& /dev/null
+    sbt publish-local >& /dev/null
+    cd - >& /dev/null
+
+    DOTTY_LIB_JAR=$(build_jar dotty-library-bootstrapped/package "out/dotty-library-bootstrapped/scala-$SCALA_BINARY_VERSION")
+
     printf "done\n"
 
     printf "Building tests..."

project/Build.scala

@@ -128,7 +128,6 @@ object Build {
     aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-doc`, dottySbtBridgeRef,
       `scala-library`, `scala-compiler`, `scala-reflect`, scalap).
     dependsOn(`dotty-compiler`).
-    dependsOn(`dotty-library`).
     settings(
       triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
 
@@ -252,7 +251,6 @@ object Build {
 
   // Settings shared between dotty-compiler and dotty-compiler-bootstrapped
   lazy val dottyCompilerSettings = Seq(
-
       // The scala-backend folder is a git submodule that contains a fork of the Scala 2.11
       // compiler developed at https://github.com/lampepfl/scala/tree/sharing-backend.
       // We do not compile the whole submodule, only the part of the Scala 2.11 GenBCode backend
@@ -484,7 +482,6 @@ object Build {
 
   lazy val `dotty-compiler` = project.in(file("compiler")).
     dependsOn(`dotty-interfaces`).
-    dependsOn(`dotty-library`).
     settings(sourceStructure).
     settings(dottyCompilerSettings).
     settings(
@@ -498,7 +495,7 @@ object Build {
         Map(
           "dotty-interfaces" -> (packageBin in (`dotty-interfaces`, Compile)).value,
           "dotty-compiler" -> (packageBin in Compile).value,
-          "dotty-library" -> (packageBin in (`dotty-library`, Compile)).value,
+          "dotty-library" -> (packageBin in (`dotty-library-bootstrapped`, Compile)).value,
           "dotty-compiler-test" -> (packageBin in Test).value
         ) map { case (k, v) => (k, v.getAbsolutePath) }
       }
@@ -542,11 +539,13 @@ object Build {
   )
 
   lazy val `dotty-library` = project.in(file("library")).
+    settings(unmanagedSourceDirectories in Compile += baseDirectory.value / "src_scalac").
     settings(sourceStructure).
     settings(dottyLibrarySettings).
     settings(publishing)
 
   lazy val `dotty-library-bootstrapped` = project.in(file("library")).
+    settings(unmanagedSourceDirectories in Compile += baseDirectory.value / "src_dotc").
     settings(sourceStructure).
     settings(commonBootstrappedSettings).
     settings(dottyLibrarySettings)
@@ -556,6 +555,7 @@ object Build {
 
   lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")).
     dependsOn(`dotty-compiler`).
+    dependsOn(`dotty-library`).
     settings(sourceStructure).
     settings(
       cleanSbtBridge := {
@@ -600,7 +600,7 @@ object Build {
       ScriptedPlugin.scripted := {
         val x1 = (publishLocal in `dotty-interfaces`).value
         val x2 = (publishLocal in `dotty-compiler`).value
-        val x3 = (publishLocal in `dotty-library`).value
+        val x3 = (publishLocal in `dotty-library-bootstrapped`).value
         val x4 = (publishLocal in dotty).value // Needed because sbt currently hardcodes the dotty artifact
         ScriptedPlugin.scriptedTask.evaluated
       }