diff options
| author | GuoQiang Li <witgo@qq.com> | 2014-10-26 16:24:50 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2014-10-26 16:24:50 -0700 |
| commit | 89e8a5d8ba57255c46cadfc803fcddeeec93325f (patch) | |
| tree | 7e6182d32e8b65927b5c457eac1c1e422a952252 /project | |
| parent | 2838bf8aadd5228829c1a869863bc4da7877fdfb (diff) | |
| download | spark-89e8a5d8ba57255c46cadfc803fcddeeec93325f.tar.gz spark-89e8a5d8ba57255c46cadfc803fcddeeec93325f.tar.bz2 spark-89e8a5d8ba57255c46cadfc803fcddeeec93325f.zip | |
[SPARK-3997][Build]scalastyle should output the error location
Author: GuoQiang Li <witgo@qq.com>
Closes #2846 from witgo/SPARK-3997 and squashes the following commits:
d6a57f8 [GuoQiang Li] scalastyle should output the error location
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 3 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index ea04473854..6d5eb681c6 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -23,7 +23,6 @@ import sbt.Classpaths.publishTask import sbt.Keys._ import sbtunidoc.Plugin.genjavadocSettings import sbtunidoc.Plugin.UnidocKeys.unidocGenjavadocVersion -import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings} import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys} import net.virtualvoid.sbt.graph.Plugin.graphSettings @@ -111,7 +110,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 ++ genjavadocSettings ++ Seq ( + lazy val sharedSettings = graphSettings ++ genjavadocSettings ++ Seq ( javaHome := Properties.envOrNone("JAVA_HOME").map(file), incOptions := incOptions.value.withNameHashing(true), retrieveManaged := true, diff --git a/project/plugins.sbt b/project/plugins.sbt index 9d50a50b10..ee45b6a519 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -19,7 +19,7 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4") -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.5.0") +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.6.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6") |