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

Merge pull request #1396 from skyluc/2.12-support 

Adds support for Scala 2.12
This commit is contained in:
Josh Suereth 2014-06-05 16:26:21 -04:00
parent e665d1268d 9c9b75c39a
commit fbb0e318fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/Util.scala
View File

@ -26,7 +26,7 @@ object Util {
def noRemotePublish(in: Seq[Setting[_]]) = in filterNot { _.key.key == publish.key }
def nightlySettings = Seq(
nightly211 <<= scalaVersion(_.startsWith("2.11.")),
nightly211 <<= scalaVersion(v => v.startsWith("2.11.") || v.startsWith("2.12.")),
includeTestDependencies <<= nightly211(x => !x)
)
def crossBuild: Seq[Setting[_]] =
@ -182,7 +182,7 @@ object Common {
lazy val testInterface = lib("org.scala-sbt" % "test-interface" % "1.0")
private def scala211Module(name: String, moduleVersion: String) =
libraryDependencies <++= (scalaVersion)(scalaVersion =>
if (scalaVersion startsWith "2.11.") ("org.scala-lang.modules" %% name % moduleVersion) :: Nil
if (scalaVersion.startsWith("2.11.") || scalaVersion.startsWith("2.12.")) ("org.scala-lang.modules" %% name % moduleVersion) :: Nil
else Nil
)
lazy val scalaXml = scala211Module("scala-xml", "1.0.1")