@@ -206,6 +206,16 @@ object DottyBuild extends Build {
206
206
207
207
// Settings shared between dotty-compiler and dotty-compiler-bootstrapped
208
208
lazy val dottyCompilerSettings = Seq (
209
+
210
+ // necessary evil: dottydoc currently needs to be included in the dotty
211
+ // project, for sbt integration
212
+ unmanagedResourceDirectories in Compile := Seq ((resourceDirectory in Compile ).value),
213
+ unmanagedResourceDirectories in Compile += baseDirectory.value / " .." / " doc-tool" / " resources" ,
214
+ unmanagedSourceDirectories in Compile := Seq ((scalaSource in Compile ).value),
215
+ unmanagedSourceDirectories in Compile += baseDirectory.value / " .." / " doc-tool" / " src" ,
216
+ unmanagedSourceDirectories in Test := Seq ((scalaSource in Test ).value),
217
+ unmanagedSourceDirectories in Test += baseDirectory.value / " .." / " doc-tool" / " test" ,
218
+
209
219
// set system in/out for repl
210
220
connectInput in run := true ,
211
221
outputStrategy := Some (StdoutOutput ),
@@ -448,17 +458,6 @@ object DottyBuild extends Build {
448
458
settings(
449
459
overrideScalaVersionSetting,
450
460
451
- // necessary evil: dottydoc currently needs to be included in the dotty
452
- // project, for sbt integration
453
- // FIXME: note part of dottyCompilerSettings because the doc-tool does not
454
- // compile with dotty
455
- unmanagedResourceDirectories in Compile := Seq ((resourceDirectory in Compile ).value),
456
- unmanagedResourceDirectories in Compile += baseDirectory.value / " .." / " doc-tool" / " resources" ,
457
- unmanagedSourceDirectories in Compile := Seq ((scalaSource in Compile ).value),
458
- unmanagedSourceDirectories in Compile += baseDirectory.value / " .." / " doc-tool" / " src" ,
459
- unmanagedSourceDirectories in Test := Seq ((scalaSource in Test ).value),
460
- unmanagedSourceDirectories in Test += baseDirectory.value / " .." / " doc-tool" / " test" ,
461
-
462
461
// Disable scaladoc generation, it's way too slow and we'll replace it
463
462
// by dottydoc anyway. We still publish an empty -javadoc.jar to make
464
463
// sonatype happy.
0 commit comments