From 54f461752f59448af2de5906d9b4dde7264be766 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 23 Jan 2013 12:48:54 -0500 Subject: [PATCH] Put 2.10+ scalac options behind scalaVersion check. Closes #649. --- project/Util.scala | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/project/Util.scala b/project/Util.scala index 747fb80c5..ea8845988 100644 --- a/project/Util.scala +++ b/project/Util.scala @@ -28,8 +28,15 @@ object Util def testedBaseProject(path: File, nameString: String) = baseProject(path, nameString) settings(includeTestDependencies := true, testDependencies) lazy val javaOnly = Seq[Setting[_]](/*crossPaths := false, */compileOrder := CompileOrder.JavaThenScala, unmanagedSourceDirectories in Compile <<= Seq(javaSource in Compile).join) - lazy val base: Seq[Setting[_]] = Seq(scalacOptions ++= Seq("-Xelide-below", "0", "-feature", "-language:implicitConversions", "-language:postfixOps", - "-language:higherKinds", "-language:existentials"), projectComponent) ++ Licensed.settings + lazy val base: Seq[Setting[_]] = baseScalacOptions ++ Licensed.settings + lazy val baseScalacOptions = Seq( + projectComponent, + scalacOptions ++= Seq("-Xelide-below", "0"), + scalacOptions <++= scalaVersion map CrossVersion.partialVersion map { + case Some((2, 9)) => Nil // support 2.9 for some subprojects for the Scala Eclipse IDE + case _ => Seq("-feature", "-language:implicitConversions", "-language:postfixOps", "-language:higherKinds", "-language:existentials") + } + ) def testDependencies = libraryDependencies <++= includeTestDependencies { incl => if(incl) Seq(