Skip to content

Commit 3341f32

Browse files
committed
fix sbt-dotty doc on sbt 1.5
1 parent 8b329bd commit 3341f32

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed
Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
scalaVersion := sys.props("plugin.scalaVersion")
22

3-
lazy val assertUsingScaladoc = taskKey[Unit]("")
4-
5-
assertUsingScaladoc := {
3+
TaskKey[Unit]("assertUsingScaladoc") := {
64
assert(useScaladoc.value)
75
}
6+
7+
TaskKey[Unit]("checkScaladocOptions") := {
8+
val options = (Compile / doc / scalacOptions).value
9+
assert(options.count(_ == "-project") == 1)
10+
}
11+
12+
TaskKey[Unit]("checkHtmlFiles") := {
13+
val helloHtml = (Compile / doc / target).value / "api" / "hello.html"
14+
assert(helloHtml.exists)
15+
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
> assertUsingScaladoc
2+
> checkScaladocOptions
23
> doc
3-
4+
> checkHtmlFiles

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,10 @@ object DottyPlugin extends AutoPlugin {
464464
else Def.task { originalSources }
465465
}.value,
466466
scalacOptions ++= {
467-
if (isDotty.value) {
467+
// From sbt 1.5 scaladoc is natively supported, and so the scalacOptions are already set.
468+
val isSbt15 = VersionNumber(sbtVersion.value)
469+
.matchesSemVer(SemanticSelector(">=1.5.0-M1"))
470+
if (isDotty.value && !isSbt15) {
468471
val projectName =
469472
if (configuration.value == Compile)
470473
name.value

0 commit comments

Comments
 (0)