From df3cbe3a330f359fbaf7011d7ba9904649d3100d Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Sun, 19 Feb 2017 04:24:11 -0800
Subject: [PATCH] [SPARK-19550][BUILD][WIP] Addendum: select Java 1.7 for
scalac 2.10, still
## What changes were proposed in this pull request?
Go back to selecting source/target 1.7 for Scala 2.10 builds, because the SBT-based build for 2.10 won't work otherwise.
## How was this patch tested?
Existing tests, but, we need to verify this vs what the SBT build would exactly run on Jenkins
Author: Sean Owen <sowen@cloudera.com>
Closes #16983 from srowen/SPARK-19550.3.
---
project/SparkBuild.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b48879faa4..93a31897c9 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -234,7 +234,9 @@ object SparkBuild extends PomBuild {
},
javacJVMVersion := "1.8",
- scalacJVMVersion := "1.8",
+ // SBT Scala 2.10 build still doesn't support Java 8, because scalac 2.10 doesn't, but,
+ // it also doesn't touch Java 8 code and it's OK to emit Java 7 bytecode in this case
+ scalacJVMVersion := (if (System.getProperty("scala-2.10") == "true") "1.7" else "1.8"),
javacOptions in Compile ++= Seq(
"-encoding", "UTF-8",
--
GitLab