Skip to content
Snippets Groups Projects
Commit a19d8c89 authored by Yin Huai's avatar Yin Huai Committed by Matei Zaharia
Browse files

[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.
parent 06dc0d2c
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ import scala.collection.JavaConversions._ ...@@ -21,6 +21,7 @@ import scala.collection.JavaConversions._
import sbt._ import sbt._
import sbt.Classpaths.publishTask import sbt.Classpaths.publishTask
import sbt.Keys._ import sbt.Keys._
import sbtunidoc.Plugin.genjavadocSettings
import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings} import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings}
import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys} import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
import net.virtualvoid.sbt.graph.Plugin.graphSettings import net.virtualvoid.sbt.graph.Plugin.graphSettings
...@@ -107,7 +108,7 @@ object SparkBuild extends PomBuild { ...@@ -107,7 +108,7 @@ object SparkBuild extends PomBuild {
lazy val MavenCompile = config("m2r") extend(Compile) lazy val MavenCompile = config("m2r") extend(Compile)
lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy") 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), javaHome := Properties.envOrNone("JAVA_HOME").map(file),
incOptions := incOptions.value.withNameHashing(true), incOptions := incOptions.value.withNameHashing(true),
retrieveManaged := true, retrieveManaged := true,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment