Skip to content

Commit 79c0019

Browse files
committed
Add Scala 2.13.0-M1 support
- upgrade scalatest version from 3.0.0 to 3.0.3 - upgrade scala-xml version from 1.0.5 to 1.0.6 - upgrade scala-logging version from 3.5.0 to 3.7.2 - add Scala 2.13.0-M1 to Travis build - change project version from 1.3.2-SNAPSHOT to 1.4.0-M1-SNAPSHOT - update README file
1 parent 686a294 commit 79c0019

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ matrix:
1111
scala: 2.11.11
1212
- jdk: oraclejdk8
1313
scala: 2.12.3
14+
- jdk: oraclejdk8
15+
scala: 2.13.0-M1
1416

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

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ scoverage is available for sbt, maven, and gradle.
99
[<img src="https://img.shields.io/maven-central/v/org.scoverage/scalac-scoverage-plugin_2.10*.svg?label=latest%20release%20for%202.10"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scoverage-plugin_2.10%22)
1010
[<img src="https://img.shields.io/maven-central/v/org.scoverage/scalac-scoverage-plugin_2.11*.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scoverage-plugin_2.11%22)
1111
[<img src="https://img.shields.io/maven-central/v/org.scoverage/scalac-scoverage-plugin_2.12*.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scoverage-plugin_2.12%22)
12+
[<img src="https://img.shields.io/maven-central/v/org.scoverage/scalac-scoverage-plugin_2.13*.svg?label=latest%20release%20for%202.13"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scoverage-plugin_2.13%22)
1213

1314
Join the [scoverage](http://groups.google.com/group/scala-code-coverage-tool)
1415
google group for help, bug reports, feature requests, and general
@@ -20,6 +21,10 @@ To see scoverage in action check out the [samples](https://github.com/scoverage/
2021

2122
### Release History
2223

24+
##### (not released yet) - 1.4.0
25+
26+
* Added Scala 2.13 support
27+
2328
##### 6th November 2016 - 1.3.0
2429

2530
* Added Scala 2.12 support

build.sbt

Lines changed: 4 additions & 4 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.0"
11+
val ScalatestVersion = "3.0.3"
1212

1313
val appSettings = Seq(
1414
organization := Org,
1515
scalaVersion := "2.12.3",
16-
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3"),
16+
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3", "2.13.0-M1"),
1717
fork in Test := false,
1818
publishMavenStyle := true,
1919
publishArtifact in Test := false,
@@ -90,8 +90,8 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
9090
)).settings(libraryDependencies ++= {
9191
CrossVersion.partialVersion(scalaVersion.value) match {
9292
case Some((2, scalaMajor)) if scalaMajor > 10 => Seq(
93-
"org.scala-lang.modules" %% "scala-xml" % "1.0.5",
94-
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0" % "test"
93+
"org.scala-lang.modules" %% "scala-xml" % "1.0.6",
94+
"com.typesafe.scala-logging" %% "scala-logging" % "3.7.2" % "test"
9595
)
9696
case _ => Seq(
9797
"com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ trait ScalaLoggingSupport {
2727
}
2828
else {
2929
Seq(
30-
findIvyJar("org.slf4j", "slf4j-api", "1.7.21"),
31-
findCrossedIvyJar("com.typesafe.scala-logging", "scala-logging", "3.5.0", "bundle")
30+
findIvyJar("org.slf4j", "slf4j-api", "1.7.25"),
31+
findCrossedIvyJar("com.typesafe.scala-logging", "scala-logging", "3.7.2", "bundle")
3232
)
3333
}
3434
}

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "1.3.2-SNAPSHOT"
1+
version in ThisBuild := "1.4.0-M1-SNAPSHOT"

0 commit comments

Comments
 (0)