Skip to content

Scala 2.13.0-M1 support #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ matrix:
scala: 2.11.11
- jdk: oraclejdk8
scala: 2.12.3
- jdk: oraclejdk8
scala: 2.13.0-M1

before_cache:
- find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ scoverage is available for sbt, maven, and gradle.
[<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)
[<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)
[<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)
[<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)

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

### Release History

##### (not released yet) - 1.4.0

* Added Scala 2.13 support

##### 6th November 2016 - 1.3.0

* Added Scala 2.12 support
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import org.scalajs.sbtplugin.cross.CrossType

val Org = "org.scoverage"
val MockitoVersion = "1.10.19"
val ScalatestVersion = "3.0.0"
val ScalatestVersion = "3.0.3"

val appSettings = Seq(
organization := Org,
scalaVersion := "2.12.3",
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3"),
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3", "2.13.0-M1"),
fork in Test := false,
publishMavenStyle := true,
publishArtifact in Test := false,
Expand Down Expand Up @@ -90,8 +90,8 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
)).settings(libraryDependencies ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, scalaMajor)) if scalaMajor > 10 => Seq(
"org.scala-lang.modules" %% "scala-xml" % "1.0.5",
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0" % "test"
"org.scala-lang.modules" %% "scala-xml" % "1.0.6",
"com.typesafe.scala-logging" %% "scala-logging" % "3.7.2" % "test"
)
case _ => Seq(
"com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ trait ScalaLoggingSupport {
}
else {
Seq(
findIvyJar("org.slf4j", "slf4j-api", "1.7.21"),
findCrossedIvyJar("com.typesafe.scala-logging", "scala-logging", "3.5.0", "bundle")
findIvyJar("org.slf4j", "slf4j-api", "1.7.25"),
findCrossedIvyJar("com.typesafe.scala-logging", "scala-logging", "3.7.2", "bundle")
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "1.3.2-SNAPSHOT"
version in ThisBuild := "1.4.0-M1-SNAPSHOT"