From 1d75c6060a2a759dc6ca2e356925df6dcaaf75f4 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Fri, 27 May 2011 11:34:07 +0100
Subject: [PATCH] Update to Scala 2.9.0-1 and disable repl module for now.
The repl module requires more complex work.
---
project/build.properties | 2 +-
project/build/SparkProject.scala | 6 +++---
run | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/project/build.properties b/project/build.properties
index e3b56f80d8..c6613ea32a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -4,5 +4,5 @@ project.organization=org.spark-project
project.name=spark
sbt.version=0.7.7
project.version=0.3-SNAPSHOT
-build.scala.versions=2.8.1
+build.scala.versions=2.9.0-1
project.initialize=false
diff --git a/project/build/SparkProject.scala b/project/build/SparkProject.scala
index 10850dfaea..469dd93ef1 100644
--- a/project/build/SparkProject.scala
+++ b/project/build/SparkProject.scala
@@ -10,7 +10,7 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje
lazy val core = project("core", "Spark Core", new CoreProject(_))
- lazy val repl = project("repl", "Spark REPL", new ReplProject(_), core)
+// lazy val repl = project("repl", "Spark REPL", new ReplProject(_), core)
lazy val examples = project("examples", "Spark Examples", new ExamplesProject(_), core)
@@ -36,8 +36,8 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje
val compressLzf = "com.ning" % "compress-lzf" % "0.7.0"
val hadoop = "org.apache.hadoop" % "hadoop-core" % "0.20.2"
val asm = "asm" % "asm-all" % "3.3.1"
- val scalaTest = "org.scalatest" % "scalatest" % "1.3" % "test"
- val scalaCheck = "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test"
+ val scalaTest = "org.scalatest" % "scalatest_2.9.0" % "1.4.1" % "test"
+ val scalaCheck = "org.scala-tools.testing" % "scalacheck_2.9.0" % "1.8" % "test"
val jetty = jettyWebapp
}
diff --git a/run b/run
index efcf63cbbc..13c40af4c2 100755
--- a/run
+++ b/run
@@ -1,6 +1,6 @@
#!/bin/bash
-SCALA_VERSION=2.8.1
+SCALA_VERSION=2.9.0
# Figure out where the Scala framework is installed
FWDIR="$(cd `dirname $0`; pwd)"
--
GitLab