@@ -10,7 +10,7 @@ lazy val commonSettings = inConfig(Test)(Defaults.testSettings) ++
10
10
sonatypeProfileName := organization.value,
11
11
scalaVersion := crossScalaVersions.value.head,
12
12
crossScalaVersions := Seq (
13
- " 2.13.0-M5 " ,
13
+ " 2.13.0-RC1 " ,
14
14
" 2.12.8" ,
15
15
" 2.11.12" ,
16
16
" 2.10.7"
@@ -76,10 +76,12 @@ def subprojectSettings(projectName: String) = commonSettings ++ Seq(
76
76
77
77
def scala2_11Dependencies = Def .setting {
78
78
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
+ )
83
85
case _ => Nil
84
86
}
85
87
}
@@ -90,7 +92,7 @@ lazy val scalariform = (project
90
92
settings(publishSettings(" scalariform" ))
91
93
settings(
92
94
libraryDependencies ++= scala2_11Dependencies.value,
93
- libraryDependencies += " org.scalatest" %% " scalatest" % " 3.0.6-SNAP6 " % Test ,
95
+ libraryDependencies += " org.scalatest" %% " scalatest" % " 3.0.8-RC2 " % Test ,
94
96
// sbt doesn't automatically load the content of the MANIFST.MF file, therefore
95
97
// we have to do it here by ourselves. Furthermore, the version format in the
96
98
// MANIFEST.MF is `version.qualifier`, which means that we have to replace
0 commit comments