Skip to content

Commit 7ff43a0

Browse files
committed
Fix DottyPlugin for Scala3 check
1 parent 5bb0e92 commit 7ff43a0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
scalaVersion := sys.props("plugin.scalaVersion")
22

33
TaskKey[Unit]("assertUsingScaladoc") := {
4-
assert(useScaladoc.value)
4+
assert(useScaladoc.value, "Scaladoc version does not match the expected pattern")
55
}
66

77
TaskKey[Unit]("checkScaladocOptions") := {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ object DottyPlugin extends AutoPlugin {
374374
resolvers ++= (if(!useScaladoc.value) Nil else Seq(Resolver.jcenterRepo)),
375375
useScaladoc := {
376376
val v = scalaVersion.value
377-
v.startsWith("3.0.0") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2")
377+
v.startsWith("3.") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2")
378378
},
379379
// We need to add doctool classes to the classpath so they can be called
380380
doc / scalaInstance := Def.taskDyn {

0 commit comments

Comments
 (0)