Skip to content

Commit e594f01

Browse files
committed
Add Scala 2.13.0-M5 support
- upgrade Scala version from 2.13.0-M4 to 2.13.0-M5 in `build.sbt` and `.travis.yml` - upgrade scalatest version from 3.0.6-SNAP1 to 3.0.6-SNAP4 - upgrade stala-xml version from 1.1.0 to 1.1.1 - upgrade sbt-scalajs version from 0.6.24 to 0.6.25 - additionally upgrade Scala 2.12.x version from 2.12.6 to latest 2.12.7 in `build.sbt` and `.travis.yml`
1 parent 42a38ab commit e594f01

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jdk:
99
scala:
1010
- 2.10.7
1111
- 2.11.12
12-
- 2.12.6
13-
- 2.13.0-M4
12+
- 2.12.7
13+
- 2.13.0-M5
1414

1515
before_cache:
1616
- find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import sbtcrossproject.CrossType
77

88
val Org = "org.scoverage"
99
val MockitoVersion = "2.19.0"
10-
val ScalatestVersion = "3.0.6-SNAP1"
10+
val ScalatestVersion = "3.0.6-SNAP4"
1111

1212
val appSettings = Seq(
1313
organization := Org,
14-
scalaVersion := "2.12.6",
15-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M4"),
14+
scalaVersion := "2.12.7",
15+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M5"),
1616
fork in Test := false,
1717
publishMavenStyle := true,
1818
publishArtifact in Test := false,
@@ -91,7 +91,7 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
9191
)).settings(libraryDependencies ++= {
9292
CrossVersion.partialVersion(scalaVersion.value) match {
9393
case Some((2, scalaMajor)) if scalaMajor > 10 => Seq(
94-
"org.scala-lang.modules" %% "scala-xml" % "1.1.0",
94+
"org.scala-lang.modules" %% "scala-xml" % "1.1.1",
9595
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.0" % "test"
9696
)
9797
case _ => Seq(

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
44

55
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
66

7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
88

99
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")

0 commit comments

Comments
 (0)