diff options
| -rw-r--r-- | project/SparkBuild.scala | 5 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c3e057969b..8b1c20c3f3 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -1,6 +1,7 @@ import sbt._ import Keys._ -import sbtassembly.Plugin.{assemblySettings, Assembly} +import sbtassembly.Plugin._ +import AssemblyKeys._ object SparkBuild extends Build { @@ -49,7 +50,7 @@ object SparkBuild extends Build { "com.google.protobuf" % "protobuf-java" % "2.3.0", "de.javakaffee" % "kryo-serializers" % "0.9" ) - ) ++ assemblySettings ++ Seq(test in Assembly := {}) + ) ++ assemblySettings ++ Seq(test in assembly := {}) def replSettings = sharedSettings ++ Seq( name := "spark-repl", diff --git a/project/build.properties b/project/build.properties index f2ccdfa377..fdb94e61f9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.11.0 +sbt.version=0.11.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index e68aa29902..6203f4d595 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,4 +7,4 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "0.11.0") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse" % "1.4.0") -addSbtPlugin("com.eed3si9n" %% "sbt-assembly" % "0.6") +addSbtPlugin("com.eed3si9n" %% "sbt-assembly" % "0.7.2") |