fix sbt-dotty doc on sbt 1.5

adpi2 · adpi2 · commit 7d1239724777 · 2021-03-15T18:11:21.000+01:00
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt
@@ -5,3 +5,8 @@ lazy val assertUsingScaladoc = taskKey[Unit]("")
 assertUsingScaladoc := {
   assert(useScaladoc.value)
 }
+
+TaskKey[Unit]("checkScaladocOptions") := {
+  val options = (doc / scalacOptions).value
+  assert(options.count(_ == "-project") == 1)
+}
diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/test b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/test
@@ -1,3 +1,3 @@
 > assertUsingScaladoc
+> checkScaladocOptions
 > doc
-
diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala
@@ -464,7 +464,9 @@ object DottyPlugin extends AutoPlugin {
       else Def.task { originalSources }
     }.value,
     scalacOptions ++= {
-      if (isDotty.value) {
+      val isSbt15 = VersionNumber(sbtVersion.value)
+        .matchesSemVer(SemanticSelector(">=1.5.0-M1"))
+      if (isDotty.value && !isSbt15) {
         val projectName =
           if (configuration.value == Compile)
             name.value

Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,8 @@ lazy val assertUsingScaladoc = taskKey[Unit]("")`
`5`	`5`	`assertUsingScaladoc := {`
`6`	`6`	`assert(useScaladoc.value)`
`7`	`7`	`}`
	`8`	`+`
	`9`	`+TaskKey[Unit]("checkScaladocOptions") := {`
	`10`	`+ val options = (doc / scalacOptions).value`
	`11`	`+ assert(options.count(_ == "-project") == 1)`
	`12`	`+}`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 > assertUsingScaladoc
 +> checkScaladocOptions
 > doc
+-