diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-09-08 15:30:16 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-09-08 15:30:16 -0700 |
| commit | 0b957997ada10fcfa96e42780482d986bf7e4885 (patch) | |
| tree | 663462407db2137b09f5d25e2743216cb4104625 /project | |
| parent | 04cfb3aa9d0cbd49af7d117f74ff75865c7b4f7a (diff) | |
| parent | 27bd74c8ad17e59dba143901a0ff394140f144a2 (diff) | |
| download | spark-0b957997ada10fcfa96e42780482d986bf7e4885.tar.gz spark-0b957997ada10fcfa96e42780482d986bf7e4885.tar.bz2 spark-0b957997ada10fcfa96e42780482d986bf7e4885.zip | |
Merge pull request #908 from pwendell/master
Fix target JVM version in scala build
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 5177325887..90948c8e2c 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -33,6 +33,10 @@ object SparkBuild extends Build { // HBase version; set as appropriate. val HBASE_VERSION = "0.94.6" + // Target JVM version + val SCALAC_JVM_VERSION = "jvm-1.5" + val JAVAC_JVM_VERSION = "1.5" + lazy val root = Project("root", file("."), settings = rootSettings) aggregate(allProjects: _*) lazy val core = Project("core", file("core"), settings = coreSettings) @@ -77,7 +81,9 @@ object SparkBuild extends Build { organization := "org.apache.spark", version := "0.8.0-SNAPSHOT", scalaVersion := "2.9.3", - scalacOptions := Seq("-unchecked", "-optimize", "-deprecation"), + 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 }, retrieveManaged := true, retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]", |