@@ -302,7 +302,8 @@ object Build {
302
302
val dottyLib = jars(" dotty-library" )
303
303
val dottyInterfaces = jars(" dotty-interfaces" )
304
304
val otherDeps = (dependencyClasspath in Compile ).value.map(_.data).mkString(File .pathSeparator)
305
- dottyLib + File .pathSeparator + dottyInterfaces + File .pathSeparator + otherDeps
305
+ val attList = (dependencyClasspath in Runtime ).value
306
+ dottyLib + File .pathSeparator + findLib(attList, " scala-library-" )
306
307
}
307
308
308
309
lazy val semanticdbSettings = Seq (
@@ -317,8 +318,7 @@ object Build {
317
318
)
318
319
)
319
320
320
- // Settings shared between dotty-doc and dotty-doc-bootstrapped
321
- lazy val dottyDocSettings = Seq (
321
+ def dottyDocSettings (implicit mode : Mode ) = Seq (
322
322
baseDirectory in (Compile , run) := baseDirectory.value / " .." ,
323
323
baseDirectory in Test := baseDirectory.value / " .." ,
324
324
@@ -336,12 +336,10 @@ object Build {
336
336
val majorVersion = baseVersion.take(baseVersion.lastIndexOf('.' ))
337
337
IO .write(file(" ./docs/_site/versions/latest-nightly-base" ), majorVersion)
338
338
339
- val sources =
340
- unmanagedSources.in(Compile , compile).value ++
341
- unmanagedSources.in(`dotty-compiler`, Compile ).value ++
342
- // TODO use bootstrapped library
343
- // Blocked by #6295, also see https://github.com/lampepfl/dotty/pull/5499
344
- unmanagedSources.in(`dotty-library`, Compile ).value
339
+ val sources = unmanagedSources.in(mode match {
340
+ case NonBootstrapped => `dotty-library`
341
+ case Bootstrapped => `dotty-library-bootstrapped`
342
+ }, Compile ).value
345
343
val args = Seq (
346
344
" -siteroot" , " docs" ,
347
345
" -project" , " Dotty" ,
0 commit comments