luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put 2.10+ scalac options behind scalaVersion check. Closes #649.

This commit is contained in:
Mark Harrah 2013-01-23 12:48:54 -05:00
parent 824000009d
commit 54f461752f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
project/Util.scala
View File

@ -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(