Skip to content

Commit

Permalink
Adds support for Scala 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
Luc Bourlier committed Jun 5, 2014
1 parent ffff517 commit cdb6aa6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions project/SBinaryProject.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object SBinaryProject extends Build
organization := "org.scala-tools.sbinary",
version := "0.4.3-SNAPSHOT",
scalaVersion := "2.10.2",
includeTestDependencies <<= scalaVersion(sv => sv.startsWith("2.10.") || sv.startsWith("2.11"))
includeTestDependencies <<= scalaVersion(sv => sv.startsWith("2.10.") || sv.startsWith("2.11.") || sv.startsWith("2.12."))
)

lazy val includeTestDependencies = SettingKey[Boolean]("include-test-dependencies")
Expand All @@ -30,7 +30,7 @@ object SBinaryProject extends Build
def aux(nameString: String) = commonSettings ++ Seq( publish := (), name := nameString )

def scalaXmlDep(scalaV: String): List[ModuleID] =
if(scalaV.startsWith("2.11.")) List("org.scala-lang.modules" %% "scala-xml" % "1.0.1") else Nil
if(scalaV.startsWith("2.11.") || scalaV.startsWith("2.12.")) List("org.scala-lang.modules" %% "scala-xml" % "1.0.2") else Nil

/*** Templating **/

Expand Down

0 comments on commit cdb6aa6

Please sign in to comment.