File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ echo -e "q\n" | sbt/sbt -Pyarn-alpha -Phadoop-0.23 -Dhadoop.version=0.23.9 yarn-
2525echo -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} ' )
2929rm scalastyle.txt
3030
3131if test ! -z " $ERRORS " ; then
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ import sbt.Classpaths.publishTask
2323import sbt .Keys ._
2424import sbtunidoc .Plugin .genjavadocSettings
2525import sbtunidoc .Plugin .UnidocKeys .unidocGenjavadocVersion
26- import org .scalastyle .sbt .ScalastylePlugin .{Settings => ScalaStyleSettings }
2726import com .typesafe .sbt .pom .{PomBuild , SbtPomKeys }
2827import 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 ,
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
1919
2020addSbtPlugin(" 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
2424addSbtPlugin(" com.typesafe" % " sbt-mima-plugin" % " 0.1.6" )
2525
You can’t perform that action at this time.
0 commit comments