From 4cc5e51e28049c7f622006238aadfc3a3928cbfb Mon Sep 17 00:00:00 2001 From: Matei Zaharia Date: Mon, 29 Aug 2011 16:13:26 -0700 Subject: Use the new SBT 0.10 assembly plugin instead of the DepJar code we had. --- project/SparkBuild.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'project/SparkBuild.scala') 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 } -- cgit v1.2.3