Skip to content

Commit

Permalink
Merge pull request #278 from Sciss/sciss_work
Browse files Browse the repository at this point in the history
add support for Scala 2.13.0-RC2
  • Loading branch information
godenji authored May 30, 2019
2 parents da8126a + 13ce7d5 commit ea70b3f
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lazy val commonSettings = inConfig(Test)(Defaults.testSettings) ++
sonatypeProfileName := organization.value,
scalaVersion := crossScalaVersions.value.head,
crossScalaVersions := Seq(
"2.13.0-M5",
"2.13.0-RC2",
"2.12.8",
"2.11.12",
"2.10.7"
Expand Down Expand Up @@ -76,10 +76,12 @@ def subprojectSettings(projectName: String) = commonSettings ++ Seq(

def scala2_11Dependencies = Def.setting {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, major)) if major >= 11 => Seq(
"org.scala-lang.modules" %% "scala-xml" % "1.1.1",
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
)
case Some((2, major)) if major >= 11 =>
val parserV = if (major == 11) "1.1.1" else "1.1.2" // cf https://github.com/scala/scala-parser-combinators/issues/197
Seq(
"org.scala-lang.modules" %% "scala-xml" % "1.2.0",
"org.scala-lang.modules" %% "scala-parser-combinators" % parserV
)
case _ => Nil
}
}
Expand All @@ -90,7 +92,7 @@ lazy val scalariform = (project
settings(publishSettings("scalariform"))
settings(
libraryDependencies ++= scala2_11Dependencies.value,
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.6-SNAP6" % Test,
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0-SNAP11" % Test,
// sbt doesn't automatically load the content of the MANIFST.MF file, therefore
// we have to do it here by ourselves. Furthermore, the version format in the
// MANIFEST.MF is `version.qualifier`, which means that we have to replace
Expand Down

0 comments on commit ea70b3f

Please sign in to comment.