diff options
| author | Sandy Ryza <sandy@cloudera.com> | 2014-11-14 14:21:57 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-14 14:21:57 -0800 |
| commit | f5f757e4ed80759dc5668c63d5663651689f8da8 (patch) | |
| tree | 148a4f9284c41d3ee8bce0a339d6c66e52aeac9a /project | |
| parent | bbd8f5bee81d5788c356977c173dd1edc42c77a3 (diff) | |
| download | spark-f5f757e4ed80759dc5668c63d5663651689f8da8.tar.gz spark-f5f757e4ed80759dc5668c63d5663651689f8da8.tar.bz2 spark-f5f757e4ed80759dc5668c63d5663651689f8da8.zip | |
SPARK-4375. no longer require -Pscala-2.10
It seems like the winds might have moved away from this approach, but wanted to post the PR anyway because I got it working and to show what it would look like.
Author: Sandy Ryza <sandy@cloudera.com>
Closes #3239 from sryza/sandy-spark-4375 and squashes the following commits:
0ffbe95 [Sandy Ryza] Enable -Dscala-2.11 in sbt
cd42d94 [Sandy Ryza] Update doc
f6644c3 [Sandy Ryza] SPARK-4375 take 2
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d95d50a1d8..c96a6c4954 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -100,8 +100,11 @@ object SparkBuild extends PomBuild { "conjunction with environment variable.") v.split("(\\s+|,)").filterNot(_.isEmpty).map(_.trim.replaceAll("-P", "")).toSeq } + if (profiles.exists(_.contains("scala-"))) { profiles + } else if (System.getProperty("scala-2.11") != null) { + profiles ++ Seq("scala-2.11") } else { println("Enabled default scala profile") profiles ++ Seq("scala-2.10") |