Fix name clashes on sbt subprojects and git submodules.

Author: nicolasstucki

build.sbt

@@ -14,9 +14,9 @@ val `dotty-sbt-bridge-bootstrapped` = Build.`dotty-sbt-bridge-bootstrapped`
 val `dotty-sbt-scripted-tests` = Build.`dotty-sbt-scripted-tests`
 val sjsSandbox = Build.sjsSandbox
 val `dotty-bench` = Build.`dotty-bench`
-val `scala-library` = Build.`scala-library`
-val `scala-compiler` = Build.`scala-compiler`
-val `scala-reflect` = Build.`scala-reflect`
+val `scala2-library` = Build.`scala2-library`
+val `scala2-compiler` = Build.`scala2-compiler`
+val `scala2-reflect` = Build.`scala2-reflect`
 val scalap = Build.scalap
 
 inThisBuild(Build.thisBuildSettings)

project/Build.scala

@@ -150,7 +150,7 @@ object Build {
     scalacOptions ++= Seq("-bootclasspath", sys.props("sun.boot.class.path")),
 
     // sbt gets very unhappy if two projects use the same target
-    target := baseDirectory.value / ".." / "out" / name.value,
+    target := baseDirectory.value / ".." / "out" / "bootstrap" / name.value,
 
     // The non-bootstrapped dotty-library is not necessary when bootstrapping dotty
     autoScalaLibrary := false,
@@ -241,7 +241,7 @@ object Build {
   lazy val `dotty-bootstrapped` = project.
     aggregate(`dotty-interfaces`, `dotty-library-bootstrapped`, `dotty-compiler-bootstrapped`, `dotty-doc-bootstrapped`,
       dottySbtBridgeBootstrappedRef,
-      `scala-library`, `scala-compiler`, `scala-reflect`, scalap).
+      `scala2-library`, `scala2-compiler`, `scala2-reflect`, scalap).
     dependsOn(`dotty-compiler-bootstrapped`).
     dependsOn(`dotty-library-bootstrapped`).
     settings(commonBootstrappedSettings)
@@ -714,8 +714,8 @@ object Build {
         val x1 = (publishLocal in `dotty-interfaces`).value
         val x2 = (publishLocal in `dotty-compiler-bootstrapped`).value
         val x3 = (publishLocal in `dotty-library-bootstrapped`).value
-        val x4 = (publishLocal in `scala-library`).value
-        val x5 = (publishLocal in `scala-reflect`).value
+        val x4 = (publishLocal in `scala2-library`).value
+        val x5 = (publishLocal in `scala2-reflect`).value
         val x6 = (publishLocal in `dotty-bootstrapped`).value // Needed because sbt currently hardcodes the dotty artifact
       }).evaluated
       // TODO: Use this instead of manually copying DottyInjectedPlugin.scala
@@ -825,13 +825,13 @@ object DottyInjectedPlugin extends AutoPlugin {
 
   // Depend on dotty-library so that sbt projects using dotty automatically
   // depend on the dotty-library
-  lazy val `scala-library` = project.
+  lazy val `scala2-library` = project.
     dependsOn(`dotty-library-bootstrapped`).
     settings(commonDummySettings)
 
-  lazy val `scala-compiler` = project.
+  lazy val `scala2-compiler` = project.
     settings(commonDummySettings)
-  lazy val `scala-reflect` = project.
+  lazy val `scala2-reflect` = project.
     settings(commonDummySettings).
     settings(
       libraryDependencies := Seq("org.scala-lang" % "scala-reflect" % scalacVersion)