aboutsummaryrefslogtreecommitdiff
path: root/project/SparkBuild.scala
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2011-08-29 16:13:26 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2011-08-29 16:13:26 -0700
commit4cc5e51e28049c7f622006238aadfc3a3928cbfb (patch)
treeb4b4c472da3745b829b8105ec83fae93dbb3ff62 /project/SparkBuild.scala
parenta161f00610bce0a44bad5977400c849e363cd056 (diff)
downloadspark-4cc5e51e28049c7f622006238aadfc3a3928cbfb.tar.gz
spark-4cc5e51e28049c7f622006238aadfc3a3928cbfb.tar.bz2
spark-4cc5e51e28049c7f622006238aadfc3a3928cbfb.zip
Use the new SBT 0.10 assembly plugin instead of the DepJar code we had.
Diffstat (limited to 'project/SparkBuild.scala')
-rw-r--r--project/SparkBuild.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 8392c63d74..4f68ca5fd9 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -1,5 +1,6 @@
import sbt._
import Keys._
+import sbtassembly.Plugin.{assemblySettings, Assembly}
object SparkBuild extends Build {
@@ -42,13 +43,12 @@ object SparkBuild extends Build {
"asm" % "asm-all" % "3.3.1",
"com.google.protobuf" % "protobuf-java" % "2.3.0",
"de.javakaffee" % "kryo-serializers" % "0.9"
- )) ++ DepJarPlugin.depJarSettings
+ )) ++ assemblySettings ++ Seq(test in Assembly := {})
def replSettings = sharedSettings ++
- Seq(libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)) ++
- DepJarPlugin.depJarSettings
+ Seq(libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _))
def examplesSettings = sharedSettings ++ Seq(libraryDependencies += "colt" % "colt" % "1.2.0")
- def bagelSettings = sharedSettings ++ DepJarPlugin.depJarSettings
+ def bagelSettings = sharedSettings
}