From 67689e0bbdaa228d12f8e85b902286455b40c983 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Mon, 18 Jan 2021 19:53:46 +0100 Subject: [PATCH 1/2] Improve error report for scala3doc missing --- main/src/main/scala/sbt/Defaults.scala | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 0ad2bea7f..86a88c5a1 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2055,13 +2055,25 @@ object Defaults extends BuildCommon { val converter = fileConverter.value val tFiles = tastyFiles.value val sv = scalaVersion.value + val allDeps = allDependencies.value (hasScala, hasJava) match { case (true, _) => val options = sOpts ++ Opts.doc.externalAPI(xapis) val runDoc = Doc.scaladoc(label, s.cacheStoreFactory sub "scala", cs.scalac match { case ac: AnalyzingCompiler => ac.onArgs(exported(s, "scaladoc")) }, fiOpts) - val docSrcs = if (ScalaArtifacts.isScala3(sv)) tFiles else srcs + val isScala3 = ScalaArtifacts.isScala3(sv) + def isScala3Doc(module: ModuleID): Boolean = { + module.configurations.exists(_.startsWith(Configurations.ScalaDocTool.name)) && + module.name == ScalaArtifacts.Scala3DocID + } + if (isScala3 && !allDeps.exists(isScala3Doc)) { + Array( + "Unresolved scala3doc artifact", + "Add 'resolvers += Resolver.JCenterRepository'" + ).foreach(m => s.log.error(m)) + } + val docSrcs = if (isScala3) tFiles else srcs runDoc(docSrcs, cp, out, options, maxErrors.value, s.log) case (_, true) => val javadoc = From 43409fcc6fd0890447cb365275fd9a601845271e Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Sun, 24 Jan 2021 18:02:50 -0500 Subject: [PATCH 2/2] Update main/src/main/scala/sbt/Defaults.scala --- main/src/main/scala/sbt/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 86a88c5a1..0c023f451 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2070,7 +2070,7 @@ object Defaults extends BuildCommon { if (isScala3 && !allDeps.exists(isScala3Doc)) { Array( "Unresolved scala3doc artifact", - "Add 'resolvers += Resolver.JCenterRepository'" + "add 'ThisBuild / resolvers += Resolver.JCenterRepository'" ).foreach(m => s.log.error(m)) } val docSrcs = if (isScala3) tFiles else srcs