@@ -16,6 +16,8 @@ val unusedWarnings = Seq(
16
16
" -Ywarn-unused"
17
17
)
18
18
19
+ val parserCombinatorsVersion = settingKey[String ](" " )
20
+
19
21
val commonSettings = Seq [Def .SettingsDefinition ](
20
22
releaseTagName := tagName.value,
21
23
releaseCrossBuild := true ,
@@ -39,7 +41,7 @@ val commonSettings = Seq[Def.SettingsDefinition](
39
41
pushChanges
40
42
),
41
43
scalaVersion := Scala212 ,
42
- crossScalaVersions := Seq (" 2.11.12" , Scala212 , " 2.10.7" , " 2.13.0-M5 " ),
44
+ crossScalaVersions := Seq (" 2.11.12" , Scala212 , " 2.10.7" , " 2.13.0-RC1 " ),
43
45
organization := " org.foundweekends" ,
44
46
scalacOptions in (Compile , doc) ++= {
45
47
val base = (baseDirectory in LocalRootProject ).value.getAbsolutePath
@@ -70,7 +72,7 @@ val knockoff = crossProject(JVMPlatform, JSPlatform)
70
72
buildInfoObject := " KnockoffBuildInfo" ,
71
73
name := " knockoff" ,
72
74
libraryDependencies ++= Seq (
73
- " org.scalatest" %% " scalatest" % " 3.0.7 " % " test" ,
75
+ " org.scalatest" %% " scalatest" % " 3.0.8-RC2 " % " test" ,
74
76
" net.sf.jtidy" % " jtidy" % " r938" % " test"
75
77
),
76
78
publishMavenStyle := true ,
@@ -109,12 +111,20 @@ val knockoff = crossProject(JVMPlatform, JSPlatform)
109
111
</developer >
110
112
</developers >
111
113
),
114
+ parserCombinatorsVersion := {
115
+ CrossVersion .partialVersion(scalaVersion.value) match {
116
+ case Some ((2 , 11 )) =>
117
+ " 1.1.1"
118
+ case _ =>
119
+ " 1.1.2"
120
+ }
121
+ },
112
122
libraryDependencies := {
113
123
CrossVersion .partialVersion(scalaVersion.value) match {
114
124
case Some ((2 , scalaMajor)) if scalaMajor >= 11 =>
115
125
libraryDependencies.value ++ Seq (
116
- " org.scala-lang.modules" %%% " scala-xml" % " 1.1 .0" ,
117
- " org.scala-lang.modules" %%% " scala-parser-combinators" % " 1.1.1 "
126
+ " org.scala-lang.modules" %%% " scala-xml" % " 1.2 .0" ,
127
+ " org.scala-lang.modules" %%% " scala-parser-combinators" % parserCombinatorsVersion.value
118
128
)
119
129
case _ =>
120
130
libraryDependencies.value
0 commit comments