diff options
| author | Yin Huai <huai@cse.ohio-state.edu> | 2014-07-25 13:00:13 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-07-25 13:00:13 -0700 |
| commit | a19d8c89d90eea7eb8295378cec3d27444e0336d (patch) | |
| tree | 41a48e6101b9e49e0363568fe1a7b2a56034d16a /project | |
| parent | 06dc0d2c6b69c5d59b4d194ced2ac85bfe2e05e2 (diff) | |
| download | spark-a19d8c89d90eea7eb8295378cec3d27444e0336d.tar.gz spark-a19d8c89d90eea7eb8295378cec3d27444e0336d.tar.bz2 spark-a19d8c89d90eea7eb8295378cec3d27444e0336d.zip | |
[SPARK-2682] Javadoc generated from Scala source code is not in javadoc's index
Add genjavadocSettings back to SparkBuild. It requires #1585 .
https://issues.apache.org/jira/browse/SPARK-2682
Author: Yin Huai <huai@cse.ohio-state.edu>
Closes #1584 from yhuai/SPARK-2682 and squashes the following commits:
2e89461 [Yin Huai] Merge remote-tracking branch 'upstream/master' into SPARK-2682
54e3b66 [Yin Huai] Add genjavadocSettings back.
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 86d47734e7..1629bc2cba 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -21,6 +21,7 @@ import scala.collection.JavaConversions._ import sbt._ import sbt.Classpaths.publishTask import sbt.Keys._ +import sbtunidoc.Plugin.genjavadocSettings import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings} import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys} import net.virtualvoid.sbt.graph.Plugin.graphSettings @@ -107,7 +108,7 @@ object SparkBuild extends PomBuild { lazy val MavenCompile = config("m2r") extend(Compile) lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy") - lazy val sharedSettings = graphSettings ++ ScalaStyleSettings ++ Seq ( + lazy val sharedSettings = graphSettings ++ ScalaStyleSettings ++ genjavadocSettings ++ Seq ( javaHome := Properties.envOrNone("JAVA_HOME").map(file), incOptions := incOptions.value.withNameHashing(true), retrieveManaged := true, |