From 995bb6292002e29f40124108861246e3111dd315 Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <eugene.vigdorchik@gmail.com>
Date: Thu, 30 Jan 2014 15:58:00 +0400
Subject: [PATCH] =pro #3841 link to scala-library when generating unified
 scaladoc.

---
 project/AkkaBuild.scala | 5 ++++-
 project/Unidoc.scala    | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 3cc60a6c43..e8a962a985 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -951,7 +951,10 @@ object AkkaBuild extends Build {
   }
   
   lazy val unidocScaladocSettings: Seq[sbt.Setting[_]]= {
-    Seq(scalacOptions in doc <++= (version, baseDirectory in akka) map scaladocOptions) ++
+    inTask(doc)(Seq(
+      scalacOptions <++= (version, baseDirectory in akka) map scaladocOptions,
+      autoAPIMappings := scaladocAutoAPI
+    )) ++
     (if (scaladocDiagramsEnabled) Seq(sunidoc ~= scaladocVerifier) else Seq.empty)
   }
 
diff --git a/project/Unidoc.scala b/project/Unidoc.scala
index 31fb756b3e..b407bb280e 100644
--- a/project/Unidoc.scala
+++ b/project/Unidoc.scala
@@ -69,10 +69,11 @@ object Unidoc {
   }
 
   def sunidocTask: Initialize[Task[File]] = {
-    (compilers, cacheDirectory, unidocSources, unidocClasspath, unidocDirectory, scalacOptions in doc, streams) map {
-      (compilers, cache, sources, classpath, target, options, s) => {
+    (compilers, cacheDirectory, unidocSources, unidocClasspath, unidocDirectory, scalacOptions in doc, apiMappings in (Compile, doc), streams) map {
+      (compilers, cache, sources, classpath, target, options, api, s) => {
         val scaladoc = new Scaladoc(100, compilers.scalac)
-        scaladoc.cached(cache / "unidoc", "main", sources, classpath, target, options, s.log)
+        val opts1 = options ++ Opts.doc.externalAPI(api)
+        scaladoc.cached(cache / "unidoc", "main", sources, classpath, target, opts1, s.log)
         target
       }
     }