diff options
| author | Ismael Juma <ismael@juma.me.uk> | 2011-05-27 11:34:07 +0100 |
|---|---|---|
| committer | Ismael Juma <ismael@juma.me.uk> | 2011-05-27 14:59:23 +0100 |
| commit | 1d75c6060a2a759dc6ca2e356925df6dcaaf75f4 (patch) | |
| tree | b94d1766510d07b2bbc228ff0626efca87fcd8c8 /project | |
| parent | e3b323321d0313018e8d4c7363e621a5ed9b0d1a (diff) | |
| download | spark-1d75c6060a2a759dc6ca2e356925df6dcaaf75f4.tar.gz spark-1d75c6060a2a759dc6ca2e356925df6dcaaf75f4.tar.bz2 spark-1d75c6060a2a759dc6ca2e356925df6dcaaf75f4.zip | |
Update to Scala 2.9.0-1 and disable repl module for now.
The repl module requires more complex work.
Diffstat (limited to 'project')
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/build/SparkProject.scala | 6 |
2 files changed, 4 insertions, 4 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 } |