WIP use bootstraped lib in testCompilation

Author: nicolasstucki

project/Build.scala

@@ -363,16 +363,17 @@ object Build {
   lazy val dottySbtBridgeBootstrappedRef = LocalProject("dotty-sbt-bridge-bootstrapped")
 
   def dottySbtBridgeReference(implicit mode: Mode): LocalProject = mode match {
-    case NonBootstrapped => dottySbtBridgeRef
-    case _ => dottySbtBridgeBootstrappedRef
+    case FullyBootstrapped => dottySbtBridgeBootstrappedRef
+    case _ => dottySbtBridgeRef
   }
 
   // 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(".")).asDottyRoot(NonBootstrapped)
-  lazy val `dotty-bootstrapped` = project.asDottyRoot(Bootstrapped)
+  lazy val `dotty-non-bootstrapped-lib` = project.in(file(".")).asDottyRoot(WithNonBootstrappedLib)
+  lazy val dotty = project.in(file(".")).asDottyRoot(WithBootstrappedLib)
+  lazy val `dotty-bootstrapped` = project.asDottyRoot(FullyBootstrapped)
 
   lazy val `dotty-interfaces` = project.in(file("interfaces")).
     settings(commonScala2Settings). // Java-only project, so this is fine
@@ -462,12 +463,12 @@ object Build {
     }
   )
 
-  lazy val `dotty-doc` = project.in(file("doc-tool")).asDottyDoc(NonBootstrapped)
-  lazy val `dotty-doc-bootstrapped` = project.in(file("doc-tool")).asDottyDoc(Bootstrapped)
+  lazy val `dotty-doc` = project.in(file("doc-tool")).asDottyDoc(WithNonBootstrappedLib)
+  lazy val `dotty-doc-bootstrapped` = project.in(file("doc-tool")).asDottyDoc(FullyBootstrapped)
 
   def dottyDoc(implicit mode: Mode): Project = mode match {
-    case NonBootstrapped => `dotty-doc`
-    case Bootstrapped => `dotty-doc-bootstrapped`
+    case FullyBootstrapped => `dotty-doc-bootstrapped`
+    case _ => `dotty-doc`
   }
 
   def testOnlyFiltered(test: String, options: String) = Def.inputTaskDyn {
@@ -765,14 +766,14 @@ object Build {
   )
 
   def dottyCompilerSettings(implicit mode: Mode): sbt.Def.SettingsDefinition =
-    if (mode == NonBootstrapped) nonBootstrapedDottyCompilerSettings else bootstrapedDottyCompilerSettings
+    if (mode == WithNonBootstrappedLib) nonBootstrapedDottyCompilerSettings else bootstrapedDottyCompilerSettings
 
-  lazy val `dotty-compiler` = project.in(file("compiler")).asDottyCompiler(NonBootstrapped)
-  lazy val `dotty-compiler-bootstrapped` = project.in(file("compiler")).asDottyCompiler(Bootstrapped)
+  lazy val `dotty-compiler` = project.in(file("compiler")).asDottyCompiler(WithNonBootstrappedLib)
+  lazy val `dotty-compiler-bootstrapped` = project.in(file("compiler")).asDottyCompiler(FullyBootstrapped)
 
   def dottyCompiler(implicit mode: Mode): Project = mode match {
-    case NonBootstrapped => `dotty-compiler`
-    case Bootstrapped => `dotty-compiler-bootstrapped`
+    case FullyBootstrapped => `dotty-compiler-bootstrapped`
+    case _ => `dotty-compiler`
   }
 
   // Settings shared between dotty-library and dotty-library-bootstrapped
@@ -790,12 +791,12 @@ object Build {
     }
   )
 
-  lazy val `dotty-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)
-  lazy val `dotty-library-bootstrapped`: Project = project.in(file("library")).asDottyLibrary(Bootstrapped)
+  lazy val `dotty-library` = project.in(file("library")).asDottyLibrary(WithNonBootstrappedLib)
+  lazy val `dotty-library-bootstrapped`: Project = project.in(file("library")).asDottyLibrary(WithBootstrappedLib)
 
   def dottyLibrary(implicit mode: Mode): Project = mode match {
-    case NonBootstrapped => `dotty-library`
-    case Bootstrapped => `dotty-library-bootstrapped`
+    case WithNonBootstrappedLib => `dotty-library`
+    case _ => `dotty-library-bootstrapped`
   }
 
   // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402)
@@ -841,8 +842,8 @@ object Build {
     parallelExecution in Test := false
   )
 
-  lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")).asDottySbtBridge(NonBootstrapped)
-  lazy val `dotty-sbt-bridge-bootstrapped` = project.in(file("sbt-bridge")).asDottySbtBridge(Bootstrapped)
+  lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")).asDottySbtBridge(WithNonBootstrappedLib)
+  lazy val `dotty-sbt-bridge-bootstrapped` = project.in(file("sbt-bridge")).asDottySbtBridge(FullyBootstrapped)
     .settings(
       // Tweak -Yscala2-unpickler to allow some sbt dependencies used in tests
       /*
@@ -862,7 +863,7 @@ object Build {
     )
 
   lazy val `dotty-language-server` = project.in(file("language-server")).
-    dependsOn(dottyCompiler(Bootstrapped)).
+    dependsOn(dottyCompiler(FullyBootstrapped)).
     settings(commonBootstrappedSettings).
     settings(
       // Sources representing the shared configuration file used to communicate between the sbt-dotty
@@ -955,10 +956,10 @@ object Build {
     ).
     settings(compileWithDottySettings)
 
-  lazy val `dotty-bench` = project.in(file("bench")).asDottyBench(NonBootstrapped)
-  lazy val `dotty-bench-bootstrapped` = project.in(file("bench")).asDottyBench(Bootstrapped)
+  lazy val `dotty-bench` = project.in(file("bench")).asDottyBench(WithNonBootstrappedLib)
+  lazy val `dotty-bench-bootstrapped` = project.in(file("bench")).asDottyBench(FullyBootstrapped)
 
-  lazy val `dotty-semanticdb` = project.in(file("semanticdb")).asDottySemanticdb(Bootstrapped)
+  lazy val `dotty-semanticdb` = project.in(file("semanticdb")).asDottySemanticdb(FullyBootstrapped)
   lazy val `dotty-semanticdb-input` = project.in(file("semanticdb/input")).settings(
     scalaVersion := "2.12.7",
     scalacOptions += "-Yrangepos",
@@ -1272,11 +1273,11 @@ object Build {
     packArchiveName := "dotty-" + dottyVersion
   )
 
-  lazy val dist = project.asDist(NonBootstrapped)
+  lazy val dist = project.asDist(WithNonBootstrappedLib)
     .settings(
       packResourceDir += (baseDirectory.value / "bin" -> "bin"),
     )
-  lazy val `dist-bootstrapped` = project.asDist(Bootstrapped)
+  lazy val `dist-bootstrapped` = project.asDist(FullyBootstrapped)
     .settings(
       packResourceDir += ((baseDirectory in dist).value / "bin" -> "bin"),
     )
@@ -1334,8 +1335,8 @@ object Build {
       )
 
     def withCommonSettings(implicit mode: Mode): Project = project.settings(mode match {
-      case NonBootstrapped => commonNonBootstrappedSettings
-      case Bootstrapped => commonBootstrappedSettings
+      case FullyBootstrapped => commonBootstrappedSettings
+      case _ => commonNonBootstrappedSettings
     })
   }
 }

project/Modes.scala

@@ -3,23 +3,31 @@ import sbt.{Project, ProjectReference, SettingsDefinition}
 object Modes {
 
   sealed trait Mode
+  sealed trait NonBootstrappedMode extends Mode
 
-  object NonBootstrapped extends Mode
-  object Bootstrapped extends Mode
+  object WithNonBootstrappedLib extends NonBootstrappedMode
+  object WithBootstrappedLib extends NonBootstrappedMode
+  object FullyBootstrapped extends Mode
 
   implicit class ProjectModesOps(val project: Project) extends AnyVal {
 
     /** Applies the settings if mode is not bootstrapped */
-    def nonBootstrappedSettings(s: SettingsDefinition*)(implicit mode: Mode): Project =
-      if (mode == NonBootstrapped) project.settings(s: _*) else project
+    def nonBootstrappedSettings(s: SettingsDefinition*)(implicit mode: Mode): Project = mode match {
+      case _: NonBootstrappedMode => project.settings(s: _*)
+      case _ => project
+    }
 
     /** Applies the settings if mode is bootstrapped */
-    def bootstrappedSettings(s: SettingsDefinition*)(implicit mode: Mode): Project =
-      if (mode == NonBootstrapped) project else project.settings(s: _*)
+    def bootstrappedSettings(s: SettingsDefinition*)(implicit mode: Mode): Project = mode match {
+      case _: NonBootstrappedMode => project
+      case _ => project.settings(s: _*)
+    }
 
     /** Aggregate only if the mode is bootstrapped */
-    def bootstrappedAggregate(s: ProjectReference*)(implicit mode: Mode): Project =
-      if (mode == NonBootstrapped) project else project.aggregate(s: _*)
+    def bootstrappedAggregate(s: ProjectReference*)(implicit mode: Mode): Project = mode match {
+      case _: NonBootstrappedMode => project
+      case _ => project.aggregate(s: _*)
+    }
 
   }
 }