diff --git a/project/build.properties b/project/build.properties index e3b56f80d8730b7adee573938956ba6f0dd118d5..c6613ea32ab9ca5d2256608c9983b48d4ccf1048 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 10850dfaea86e1ccfb927e8a6f2f03c9ff05c0ef..469dd93ef1dd329ef9496fa7592008fd6d6c007e 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 efcf63cbbcf208e1d7ff5bd183b6d80f756c302c..13c40af4c20b9eab023e83f860d502b4da7f7aa7 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)"