You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/04/07 21:37:35 UTC
spark git commit: [SPARK-6750] Upgrade ScalaStyle to 0.7.
Repository: spark
Updated Branches:
refs/heads/master 2c32bef17 -> 123221591
[SPARK-6750] Upgrade ScalaStyle to 0.7.
0.7 fixes a bug that's pretty useful, i.e. inline functions no longer return explicit type definition.
Author: Reynold Xin <rx...@databricks.com>
Closes #5399 from rxin/style0.7 and squashes the following commits:
54c41b2 [Reynold Xin] Actually update the version.
09c759c [Reynold Xin] [SPARK-6750] Upgrade ScalaStyle to 0.7.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/12322159
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/12322159
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/12322159
Branch: refs/heads/master
Commit: 12322159147581602978f7f5a6b33b887ef781a1
Parents: 2c32bef
Author: Reynold Xin <rx...@databricks.com>
Authored: Tue Apr 7 12:37:33 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Tue Apr 7 12:37:33 2015 -0700
----------------------------------------------------------------------
project/plugins.sbt | 2 +-
project/project/SparkPluginBuild.scala | 16 +-------
.../scalastyle/NonASCIICharacterChecker.scala | 39 --------------------
3 files changed, 2 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/12322159/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ee45b6a..7096b0d 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.6.0")
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.7.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
http://git-wip-us.apache.org/repos/asf/spark/blob/12322159/project/project/SparkPluginBuild.scala
----------------------------------------------------------------------
diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala
index 8863f27..471d00b 100644
--- a/project/project/SparkPluginBuild.scala
+++ b/project/project/SparkPluginBuild.scala
@@ -24,20 +24,6 @@ import sbt.Keys._
* becomes available for scalastyle sbt plugin.
*/
object SparkPluginDef extends Build {
- lazy val root = Project("plugins", file(".")) dependsOn(sparkStyle, sbtPomReader)
- lazy val sparkStyle = Project("spark-style", file("spark-style"), settings = styleSettings)
+ lazy val root = Project("plugins", file(".")) dependsOn(sbtPomReader)
lazy val sbtPomReader = uri("https://github.com/ScrapCodes/sbt-pom-reader.git#ignore_artifact_id")
-
- // There is actually no need to publish this artifact.
- def styleSettings = Defaults.defaultSettings ++ Seq (
- name := "spark-style",
- organization := "org.apache.spark",
- scalaVersion := "2.10.4",
- scalacOptions := Seq("-unchecked", "-deprecation"),
- libraryDependencies ++= Dependencies.scalaStyle
- )
-
- object Dependencies {
- val scalaStyle = Seq("org.scalastyle" %% "scalastyle" % "0.4.0")
- }
}
http://git-wip-us.apache.org/repos/asf/spark/blob/12322159/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala
----------------------------------------------------------------------
diff --git a/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala b/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala
deleted file mode 100644
index 3d43c35..0000000
--- a/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.spark.scalastyle
-
-import java.util.regex.Pattern
-
-import org.scalastyle.{PositionError, ScalariformChecker, ScalastyleError}
-
-import scalariform.lexer.Token
-import scalariform.parser.CompilationUnit
-
-class NonASCIICharacterChecker extends ScalariformChecker {
- val errorKey: String = "non.ascii.character.disallowed"
-
- override def verify(ast: CompilationUnit): List[ScalastyleError] = {
- ast.tokens.filter(hasNonAsciiChars).map(x => PositionError(x.offset)).toList
- }
-
- private def hasNonAsciiChars(x: Token) =
- x.rawText.trim.nonEmpty && !Pattern.compile( """\p{ASCII}+""", Pattern.DOTALL)
- .matcher(x.text.trim).matches()
-
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org