Skip to content

Commit 8e827b6

Browse files
committed
add support for Scala 2.13.0-RC1
- update some dependencies (minor versions) - careful with scala/scala-parser-combinators#197
1 parent da8126a commit 8e827b6

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

build.sbt

+8-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lazy val commonSettings = inConfig(Test)(Defaults.testSettings) ++
1010
sonatypeProfileName := organization.value,
1111
scalaVersion := crossScalaVersions.value.head,
1212
crossScalaVersions := Seq(
13-
"2.13.0-M5",
13+
"2.13.0-RC1",
1414
"2.12.8",
1515
"2.11.12",
1616
"2.10.7"
@@ -76,10 +76,12 @@ def subprojectSettings(projectName: String) = commonSettings ++ Seq(
7676

7777
def scala2_11Dependencies = Def.setting {
7878
CrossVersion.partialVersion(scalaVersion.value) match {
79-
case Some((2, major)) if major >= 11 => Seq(
80-
"org.scala-lang.modules" %% "scala-xml" % "1.1.1",
81-
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
82-
)
79+
case Some((2, major)) if major >= 11 =>
80+
val parserV = if (major == 11) "1.1.1" else "1.1.2" // cf https://github.com/scala/scala-parser-combinators/issues/197
81+
Seq(
82+
"org.scala-lang.modules" %% "scala-xml" % "1.2.0",
83+
"org.scala-lang.modules" %% "scala-parser-combinators" % parserV
84+
)
8385
case _ => Nil
8486
}
8587
}
@@ -90,7 +92,7 @@ lazy val scalariform = (project
9092
settings(publishSettings("scalariform"))
9193
settings(
9294
libraryDependencies ++= scala2_11Dependencies.value,
93-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.6-SNAP6" % Test,
95+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test,
9496
// sbt doesn't automatically load the content of the MANIFST.MF file, therefore
9597
// we have to do it here by ourselves. Furthermore, the version format in the
9698
// MANIFEST.MF is `version.qualifier`, which means that we have to replace

0 commit comments

Comments
 (0)