diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-20 10:40:07 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-20 10:40:07 -0700 |
| commit | 4b57f83209b94f87890ef307af45fa493e7fdba8 (patch) | |
| tree | 4a529e35128ef82a0a19e97280a150e5c06f6381 /project/SparkBuild.scala | |
| parent | 73b3feebb9afa1bb3a45629a3bba77271f77489e (diff) | |
| parent | bf5fc07379c083cdf6de66f28344997651009787 (diff) | |
| download | spark-4b57f83209b94f87890ef307af45fa493e7fdba8.tar.gz spark-4b57f83209b94f87890ef307af45fa493e7fdba8.tar.bz2 spark-4b57f83209b94f87890ef307af45fa493e7fdba8.zip | |
Merge pull request #535 from ScrapCodes/scala-2.10-repl-port
porting of repl to scala-2.10
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d0b3c350f1..9fcdbb5b92 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -17,11 +17,11 @@ object SparkBuild extends Build { //val HADOOP_VERSION = "2.0.0-mr1-cdh4.1.1" //val HADOOP_MAJOR_VERSION = "2" - lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, /*repl,*/ examples, bagel) + lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, repl, examples, bagel) lazy val core = Project("core", file("core"), settings = coreSettings) -// lazy val repl = Project("repl", file("repl"), settings = replSettings) dependsOn (core) + lazy val repl = Project("repl", file("repl"), settings = replSettings) dependsOn (core) lazy val examples = Project("examples", file("examples"), settings = examplesSettings) dependsOn (core) @@ -35,7 +35,7 @@ object SparkBuild extends Build { organization := "org.spark-project", version := "0.7.0-SNAPSHOT", scalaVersion := "2.10.0", - scalacOptions := Seq(/*"-deprecation",*/ "-unchecked", "-optimize"), // -deprecation is too noisy due to usage of old Hadoop API, enable it once that's no longer an issue + scalacOptions := Seq("-unchecked", "-optimize"), unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, retrieveManaged := true, retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]", @@ -136,7 +136,9 @@ object SparkBuild extends Build { "io.spray" %% "spray-json" % "1.2.3", "colt" % "colt" % "1.2.0", "org.apache.mesos" % "mesos" % "0.9.0-incubating", - "org.scala-lang" % "scala-actors" % "2.10.0" + "org.scala-lang" % "scala-actors" % "2.10.0", + "org.scala-lang" % "jline" % "2.10.0", + "org.scala-lang" % "scala-reflect" % "2.10.0" ) ++ (if (HADOOP_MAJOR_VERSION == "2") Some("org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION) else None).toSeq, unmanagedSourceDirectories in Compile <+= baseDirectory{ _ / ("src/hadoop" + HADOOP_MAJOR_VERSION + "/scala") } @@ -146,10 +148,11 @@ object SparkBuild extends Build { publish := {} ) -/* def replSettings = sharedSettings ++ Seq( + def replSettings = sharedSettings ++ Seq( name := "spark-repl", - libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _) - )*/ + // libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _) + libraryDependencies ++= Seq("org.scala-lang" % "scala-compiler" % "2.10.0") + ) def examplesSettings = sharedSettings ++ Seq( name := "spark-examples" |