You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2017/02/19 12:24:15 UTC
spark git commit: [SPARK-19550][BUILD][WIP] Addendum: select Java 1.7
for scalac 2.10, still
Repository: spark
Updated Branches:
refs/heads/master b486ffc86 -> df3cbe3a3
[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 <so...@cloudera.com>
Closes #16983 from srowen/SPARK-19550.3.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df3cbe3a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df3cbe3a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df3cbe3a
Branch: refs/heads/master
Commit: df3cbe3a330f359fbaf7011d7ba9904649d3100d
Parents: b486ffc
Author: Sean Owen <so...@cloudera.com>
Authored: Sun Feb 19 04:24:11 2017 -0800
Committer: Sean Owen <so...@cloudera.com>
Committed: Sun Feb 19 04:24:11 2017 -0800
----------------------------------------------------------------------
project/SparkBuild.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/df3cbe3a/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b48879f..93a3189 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",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org