You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2017/12/21 16:08:42 UTC
spark git commit: [SPARK-22855][BUILD] Add -no-java-comments to sbt
docs/scalacOptions
Repository: spark
Updated Branches:
refs/heads/master 0abaf31be -> 4c2efde93
[SPARK-22855][BUILD] Add -no-java-comments to sbt docs/scalacOptions
Prevents Scala 2.12 scaladoc from blowing up attempting to parse java comments.
## What changes were proposed in this pull request?
Adds -no-java-comments to docs/scalacOptions under Scala 2.12. Also
moves scaladoc configs out of the TestSettings and into the standard sharedSettings
section in SparkBuild.scala.
## How was this patch tested?
SBT_OPTS=-Dscala-2.12 sbt
++2.12.4
tags/publishLocal
Author: Erik LaBianca <er...@gmail.com>
Closes #20042 from easel/scaladoc-212.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4c2efde9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4c2efde9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4c2efde9
Branch: refs/heads/master
Commit: 4c2efde9314a5f67052ac87bfa1472ebb9aca74a
Parents: 0abaf31
Author: Erik LaBianca <er...@gmail.com>
Authored: Thu Dec 21 10:08:38 2017 -0600
Committer: Sean Owen <so...@cloudera.com>
Committed: Thu Dec 21 10:08:38 2017 -0600
----------------------------------------------------------------------
project/SparkBuild.scala | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4c2efde9/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 8305494..7469f11 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -254,6 +254,21 @@ object SparkBuild extends PomBuild {
"-sourcepath", (baseDirectory in ThisBuild).value.getAbsolutePath // Required for relative source links in scaladoc
),
+ // Remove certain packages from Scaladoc
+ scalacOptions in (Compile, doc) := Seq(
+ "-groups",
+ "-skip-packages", Seq(
+ "org.apache.spark.api.python",
+ "org.apache.spark.network",
+ "org.apache.spark.deploy",
+ "org.apache.spark.util.collection"
+ ).mkString(":"),
+ "-doc-title", "Spark " + version.value.replaceAll("-SNAPSHOT", "") + " ScalaDoc"
+ ) ++ {
+ // Do not attempt to scaladoc javadoc comments under 2.12 since it can't handle inner classes
+ if (scalaBinaryVersion.value == "2.12") Seq("-no-java-comments") else Seq.empty
+ },
+
// Implements -Xfatal-warnings, ignoring deprecation warnings.
// Code snippet taken from https://issues.scala-lang.org/browse/SI-8410.
compile in Compile := {
@@ -828,18 +843,7 @@ object TestSettings {
}
Seq.empty[File]
}).value,
- concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
- // Remove certain packages from Scaladoc
- scalacOptions in (Compile, doc) := Seq(
- "-groups",
- "-skip-packages", Seq(
- "org.apache.spark.api.python",
- "org.apache.spark.network",
- "org.apache.spark.deploy",
- "org.apache.spark.util.collection"
- ).mkString(":"),
- "-doc-title", "Spark " + version.value.replaceAll("-SNAPSHOT", "") + " ScalaDoc"
- )
+ concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)
)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org