From 7ff43a04b1f9b13cd8376d779d58d77cca8a5627 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 30 Mar 2021 13:50:33 +0200 Subject: [PATCH] Fix DottyPlugin for Scala3 check --- sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt | 2 +- sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt index 87e6de42040f..602c187178e6 100644 --- a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt +++ b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/build.sbt @@ -1,7 +1,7 @@ scalaVersion := sys.props("plugin.scalaVersion") TaskKey[Unit]("assertUsingScaladoc") := { - assert(useScaladoc.value) + assert(useScaladoc.value, "Scaladoc version does not match the expected pattern") } TaskKey[Unit]("checkScaladocOptions") := { diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala index ba2c072177cf..8d19f1998efe 100644 --- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala +++ b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala @@ -374,7 +374,7 @@ object DottyPlugin extends AutoPlugin { resolvers ++= (if(!useScaladoc.value) Nil else Seq(Resolver.jcenterRepo)), useScaladoc := { val v = scalaVersion.value - v.startsWith("3.0.0") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2") + v.startsWith("3.") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2") }, // We need to add doctool classes to the classpath so they can be called doc / scalaInstance := Def.taskDyn {