From 4c94907ebf06e20d208dc706872542dd089ffe62 Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Thu, 23 Jan 2014 15:46:24 +0400 Subject: [PATCH] =pro #3841 - use autoAPIMappings := true to link to scala-library in scaladoc. --- project/AkkaBuild.scala | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index dc4d66f5f6..6d98abc22c 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -929,18 +929,21 @@ object AkkaBuild extends Build { }) lazy val scaladocDiagramsEnabled = System.getProperty("akka.scaladoc.diagrams", "true").toBoolean + lazy val scaladocAutoAPI = System.getProperty("akka.scaladoc.autoapi", "true").toBoolean + lazy val scaladocOptions = List("-implicits") ::: (if (scaladocDiagramsEnabled) List("-diagrams") else Nil) - lazy val scaladocSettings: Seq[sbt.Setting[_]]= { - Seq(scalacOptions in (Compile, doc) ++= scaladocOptions) ++ - (if (scaladocDiagramsEnabled) - Seq(doc in Compile ~= scaladocVerifier) - else Seq.empty) + lazy val scaladocSettings: Seq[sbt.Setting[_]] = { + scaladocSettingsNoVerificationOfDiagrams ++ + (if (scaladocDiagramsEnabled) Seq(doc in Compile ~= scaladocVerifier) else Seq.empty) } // for projects with few (one) classes there might not be any diagrams lazy val scaladocSettingsNoVerificationOfDiagrams: Seq[sbt.Setting[_]]= { - Seq(scalacOptions in (Compile, doc) ++= scaladocOptions) + Seq( + scalacOptions in (Compile, doc) ++= scaladocOptions, + autoAPIMappings := scaladocAutoAPI + ) } lazy val unidocScaladocSettings: Seq[sbt.Setting[_]]= {