From f5f757e4ed80759dc5668c63d5663651689f8da8 Mon Sep 17 00:00:00 2001 From: Sandy Ryza Date: Fri, 14 Nov 2014 14:21:57 -0800 Subject: 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 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 --- project/SparkBuild.scala | 3 +++ 1 file changed, 3 insertions(+) (limited to 'project') 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") -- cgit v1.2.3