Skip to content

Commit a49c147

Browse files
committed
Add Scala 2.13.0-M3 support
- upgrade Scala version from 2.13.0-M2 to 2.13.0-M3 in `build.sbt` and `.travis.yml` - upgrade scala-js version from 0.6.20 to 0.6.22 - upgrade scalatest version from 3.0.4 to 3.0.5-M1 - upgrade stala-logging version from 3.7.2 to 3.8.0
1 parent 401eaf5 commit a49c147

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ matrix:
1212
- jdk: oraclejdk8
1313
scala: 2.12.4
1414
- jdk: oraclejdk8
15-
scala: 2.13.0-M2
15+
scala: 2.13.0-M3
1616

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

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import org.scalajs.sbtplugin.cross.CrossType
88

99
val Org = "org.scoverage"
1010
val MockitoVersion = "1.10.19"
11-
val ScalatestVersion = "3.0.4"
11+
val ScalatestVersion = "3.0.5-M1"
1212

1313
val appSettings = Seq(
1414
organization := Org,
1515
scalaVersion := "2.12.4",
16-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.4", "2.13.0-M2"),
16+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.4", "2.13.0-M3"),
1717
fork in Test := false,
1818
publishMavenStyle := true,
1919
publishArtifact in Test := false,
@@ -92,7 +92,7 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
9292
CrossVersion.partialVersion(scalaVersion.value) match {
9393
case Some((2, scalaMajor)) if scalaMajor > 10 => Seq(
9494
"org.scala-lang.modules" %% "scala-xml" % "1.0.6",
95-
"com.typesafe.scala-logging" %% "scala-logging" % "3.7.2" % "test"
95+
"com.typesafe.scala-logging" %% "scala-logging" % "3.8.0" % "test"
9696
)
9797
case _ => Seq(
9898
"com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test"

project/plugins.sbt

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

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

7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")

scalac-scoverage-plugin/src/test/scala/scoverage/ScalaLoggingSupport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ trait ScalaLoggingSupport {
2828
else {
2929
Seq(
3030
findIvyJar("org.slf4j", "slf4j-api", "1.7.25"),
31-
findCrossedIvyJar("com.typesafe.scala-logging", "scala-logging", "3.7.2", "bundle")
31+
findCrossedIvyJar("com.typesafe.scala-logging", "scala-logging", "3.8.0", "bundle")
3232
)
3333
}
3434
}

0 commit comments

Comments
 (0)