Skip to content

Commit

Permalink
Upgrade to Scala 2.9.1.
Browse files Browse the repository at this point in the history
Interestingly, the version in Maven is 2.9.1, but SBT outputs file to the 2.9.1.final
directory inside target.

A couple of small changes in SparkIMain were also required.

All tests pass and ./spark-shell launches successfully.
  • Loading branch information
ijuma committed Aug 31, 2011
1 parent 1069740 commit 483f724
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
Expand Up @@ -17,7 +17,7 @@ object SparkBuild extends Build {
def sharedSettings = Defaults.defaultSettings ++ Seq(
organization := "org.spark-project",
version := "0.4-SNAPSHOT",
scalaVersion := "2.9.0-1",
scalaVersion := "2.9.1",
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
unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath },
retrieveManaged := true,
Expand Down
4 changes: 2 additions & 2 deletions repl/src/main/scala/spark/repl/SparkIMain.scala
Expand Up @@ -356,7 +356,7 @@ class SparkIMain(val settings: Settings, protected val out: PrintWriter) extends
private def mostRecentlyHandledTree: Option[Tree] = {
prevRequests.reverse foreach { req =>
req.handlers.reverse foreach {
case x: MemberDefHandler if x.definesValue && !isInternalVarName(x.name) => return Some(x.member)
case x: MemberDefHandler if x.definesValue && !isInternalVarName(x.name.toString) => return Some(x.member)
case _ => ()
}
}
Expand Down Expand Up @@ -1023,7 +1023,7 @@ class SparkIMain(val settings: Settings, protected val out: PrintWriter) extends
protected def onlyTerms(xs: List[Name]) = xs collect { case x: TermName => x }
protected def onlyTypes(xs: List[Name]) = xs collect { case x: TypeName => x }

def definedTerms = onlyTerms(allDefinedNames) filterNot isInternalVarName
def definedTerms = onlyTerms(allDefinedNames) filterNot (x => isInternalVarName(x.toString))
def definedTypes = onlyTypes(allDefinedNames)
def definedSymbols = prevRequests.toSet flatMap ((x: Request) => x.definedSymbols.values)

Expand Down
2 changes: 1 addition & 1 deletion run
@@ -1,6 +1,6 @@
#!/bin/bash

SCALA_VERSION=2.9.0.1
SCALA_VERSION=2.9.1.final

# Figure out where the Scala framework is installed
FWDIR="$(cd `dirname $0`; pwd)"
Expand Down

0 comments on commit 483f724

Please sign in to comment.