diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-09 10:32:42 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-09 10:32:42 -0700 |
| commit | 7d50f9f87baeb1f4b8d77d669d25649b97dd1d57 (patch) | |
| tree | 7c5c0602a36fe17feff8d0bb1db6c6f30d756199 /project | |
| parent | 3fe12cc2cab45e08e80f6cc355dc935c3473757a (diff) | |
| parent | e09f4a9601b18921c309903737d309eab5c6d891 (diff) | |
| download | spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.tar.gz spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.tar.bz2 spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.zip | |
Merge pull request #35 from MartinWeindel/scala-2.10
Fixing inconsistencies and warnings on Scala 2.10 branch
- scala 2.10 requires Java 1.6
- using newest Scala release: 2.10.3
- resolved maven-scala-plugin warning
- fixed various compiler warnings
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index b5e65a1856..5d4250a53b 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -34,8 +34,8 @@ object SparkBuild extends Build { val HBASE_VERSION = "0.94.6" // Target JVM version - val SCALAC_JVM_VERSION = "jvm-1.5" - val JAVAC_JVM_VERSION = "1.5" + val SCALAC_JVM_VERSION = "jvm-1.6" + val JAVAC_JVM_VERSION = "1.6" lazy val root = Project("root", file("."), settings = rootSettings) aggregate(allProjects: _*) @@ -80,7 +80,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.apache.spark", version := "0.8.0-SNAPSHOT", - scalaVersion := "2.10.2", + scalaVersion := "2.10.3", scalacOptions := Seq("-unchecked", "-optimize", "-deprecation", "-target:" + SCALAC_JVM_VERSION), javacOptions := Seq("-target", JAVAC_JVM_VERSION, "-source", JAVAC_JVM_VERSION), unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, |