Skip to content

Commit d6a57f8

Browse files
committed
scalastyle should output the error location
1 parent d2987e8 commit d6a57f8

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

dev/scalastyle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ echo -e "q\n" | sbt/sbt -Pyarn-alpha -Phadoop-0.23 -Dhadoop.version=0.23.9 yarn-
2525
echo -e "q\n" | sbt/sbt -Pyarn -Phadoop-2.2 -Dhadoop.version=2.2.0 yarn/scalastyle \
2626
>> scalastyle.txt
2727

28-
ERRORS=$(cat scalastyle.txt | grep -e "\<error\>")
28+
ERRORS=$(cat scalastyle.txt | awk '{if($1~/error/)print}')
2929
rm scalastyle.txt
3030

3131
if test ! -z "$ERRORS"; then

project/SparkBuild.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import sbt.Classpaths.publishTask
2323
import sbt.Keys._
2424
import sbtunidoc.Plugin.genjavadocSettings
2525
import sbtunidoc.Plugin.UnidocKeys.unidocGenjavadocVersion
26-
import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings}
2726
import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
2827
import net.virtualvoid.sbt.graph.Plugin.graphSettings
2928

@@ -111,7 +110,7 @@ object SparkBuild extends PomBuild {
111110
lazy val MavenCompile = config("m2r") extend(Compile)
112111
lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy")
113112

114-
lazy val sharedSettings = graphSettings ++ ScalaStyleSettings ++ genjavadocSettings ++ Seq (
113+
lazy val sharedSettings = graphSettings ++ genjavadocSettings ++ Seq (
115114
javaHome := Properties.envOrNone("JAVA_HOME").map(file),
116115
incOptions := incOptions.value.withNameHashing(true),
117116
retrieveManaged := true,

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
1919

2020
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
2121

22-
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.5.0")
22+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.6.0")
2323

2424
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
2525

0 commit comments

Comments
 (0)