diff options
Diffstat (limited to 'project')
-rw-r--r-- | project/SparkBuild.scala | 4 | ||||
-rw-r--r-- | project/build.properties | 2 | ||||
-rw-r--r-- | project/plugins.sbt | 11 | ||||
-rw-r--r-- | project/project/SparkPluginBuild.scala | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 11a937e011..bb79f0cd73 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -21,6 +21,8 @@ import Keys._ import sbtassembly.Plugin._ import AssemblyKeys._ import scala.util.Properties +import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings} + // For Sonatype publishing //import com.jsuereth.pgp.sbtplugin.PgpKeys._ @@ -231,7 +233,7 @@ object SparkBuild extends Build { publishMavenStyle in MavenCompile := true, publishLocal in MavenCompile <<= publishTask(publishLocalConfiguration in MavenCompile, deliverLocal), publishLocalBoth <<= Seq(publishLocal in MavenCompile, publishLocal).dependOn - ) ++ net.virtualvoid.sbt.graph.Plugin.graphSettings + ) ++ net.virtualvoid.sbt.graph.Plugin.graphSettings ++ ScalaStyleSettings val slf4jVersion = "1.7.2" diff --git a/project/build.properties b/project/build.properties index 839f5fbb0c..4b52bb928a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -sbt.version=0.12.4 +sbt.version=0.13.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 4ba0e4280a..914f2e05a4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,10 @@ +scalaVersion := "2.10.3" + resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns) resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/" -resolvers += "Spray Repository" at "http://repo.spray.cc/" - -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.2") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.10.2") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0") @@ -15,4 +15,7 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1") //addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6") -addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.3") +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4") + +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.4.0") + diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index 4853be2617..0392a6051f 100644 --- a/project/project/SparkPluginBuild.scala +++ b/project/project/SparkPluginBuild.scala @@ -20,5 +20,5 @@ import sbt._ object SparkPluginDef extends Build { lazy val root = Project("plugins", file(".")) dependsOn(junitXmlListener) /* This is not published in a Maven repository, so we get it from GitHub directly */ - lazy val junitXmlListener = uri("https://github.com/ijuma/junit_xml_listener.git#fe434773255b451a38e8d889536ebc260f4225ce") + lazy val junitXmlListener = uri("git://github.com/chenkelmann/junit_xml_listener.git#3f8029fbfda54dc7a68b1afd2f885935e1090016") } |