@@ -1167,6 +1167,11 @@ object Build {
11671167 sources.in(Test ) := Nil
11681168 )
11691169
1170+ def scalaDoc (implicit mode : Mode ): Project = mode match {
1171+ case NonBootstrapped => `scaladoc-nonBootstrapped`
1172+ case Bootstrapped => scaladoc
1173+ }
1174+
11701175 lazy val `scaladoc-testcases` = project.in(file(" scaladoc-testcases" )).asScaladocTestcases
11711176
11721177 lazy val `scaladoc-js` = project.in(file(" scaladoc-js" )).asScaladocJs
@@ -1459,7 +1464,7 @@ object Build {
14591464
14601465 // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
14611466 def asDottyRoot (implicit mode : Mode ): Project = project.withCommonSettings.
1462- aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, scaladoc, `scala3-sbt-bridge`).
1467+ aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, ` scaladoc-nonBootstrapped` , `scala3-sbt-bridge`).
14631468 bootstrappedAggregate(`scala3-language-server`, `scala3-staging`, `scala3-tasty-inspector`,
14641469 `scala3-library-bootstrappedJS`, scaladoc).
14651470 dependsOn(tastyCore).
@@ -1681,7 +1686,7 @@ object Build {
16811686 def asDist (implicit mode : Mode ): Project = project.
16821687 enablePlugins(PackPlugin ).
16831688 withCommonSettings.
1684- dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scaladoc ).
1689+ dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scalaDoc ).
16851690 settings(commonDistSettings).
16861691 bootstrappedSettings(
16871692 target := baseDirectory.value / " target" // override setting in commonBootstrappedSettings
0 commit comments