Skip to content

Commit a19d8c8

Browse files
yhuaimateiz
authored andcommitted
[SPARK-2682] Javadoc generated from Scala source code is not in javadoc's index
Add genjavadocSettings back to SparkBuild. It requires apache#1585 . https://issues.apache.org/jira/browse/SPARK-2682 Author: Yin Huai <[email protected]> Closes apache#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.
1 parent 06dc0d2 commit a19d8c8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

project/SparkBuild.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import scala.collection.JavaConversions._
2121
import sbt._
2222
import sbt.Classpaths.publishTask
2323
import sbt.Keys._
24+
import sbtunidoc.Plugin.genjavadocSettings
2425
import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings}
2526
import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
2627
import net.virtualvoid.sbt.graph.Plugin.graphSettings
@@ -107,7 +108,7 @@ object SparkBuild extends PomBuild {
107108
lazy val MavenCompile = config("m2r") extend(Compile)
108109
lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy")
109110

110-
lazy val sharedSettings = graphSettings ++ ScalaStyleSettings ++ Seq (
111+
lazy val sharedSettings = graphSettings ++ ScalaStyleSettings ++ genjavadocSettings ++ Seq (
111112
javaHome := Properties.envOrNone("JAVA_HOME").map(file),
112113
incOptions := incOptions.value.withNameHashing(true),
113114
retrieveManaged := true,

0 commit comments

Comments
 (0)