Skip to content

Commit fcca104

Browse files
committed
Scala 2.13.0-RC1
1 parent a8a451f commit fcca104

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ scala:
44
- 2.10.7
55
- 2.11.12
66
- 2.12.8
7-
- 2.13.0-M5
7+
- 2.13.0-RC1
88
jdk:
99
- oraclejdk8
1010
script:

build.sbt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ val unusedWarnings = Seq(
1616
"-Ywarn-unused"
1717
)
1818

19+
val parserCombinatorsVersion = settingKey[String]("")
20+
1921
val commonSettings = Seq[Def.SettingsDefinition](
2022
releaseTagName := tagName.value,
2123
releaseCrossBuild := true,
@@ -39,7 +41,7 @@ val commonSettings = Seq[Def.SettingsDefinition](
3941
pushChanges
4042
),
4143
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"),
4345
organization := "org.foundweekends",
4446
scalacOptions in (Compile, doc) ++= {
4547
val base = (baseDirectory in LocalRootProject).value.getAbsolutePath
@@ -70,7 +72,7 @@ val knockoff = crossProject(JVMPlatform, JSPlatform)
7072
buildInfoObject := "KnockoffBuildInfo",
7173
name := "knockoff",
7274
libraryDependencies ++= Seq(
73-
"org.scalatest" %% "scalatest" % "3.0.7" % "test",
75+
"org.scalatest" %% "scalatest" % "3.0.8-RC2" % "test",
7476
"net.sf.jtidy" % "jtidy" % "r938" % "test"
7577
),
7678
publishMavenStyle := true,
@@ -109,12 +111,20 @@ val knockoff = crossProject(JVMPlatform, JSPlatform)
109111
</developer>
110112
</developers>
111113
),
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+
},
112122
libraryDependencies := {
113123
CrossVersion.partialVersion(scalaVersion.value) match {
114124
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
115125
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
118128
)
119129
case _ =>
120130
libraryDependencies.value

0 commit comments

Comments
 (0)