From 1edf221d45381bf7ec8ee2aa1cf8cc8b3e1192b7 Mon Sep 17 00:00:00 2001 From: Dragisa Krsmanovic Date: Tue, 18 May 2021 12:13:16 -0700 Subject: [PATCH 1/2] Add support for Scala 2.13.6 --- .github/workflows/ci.yml | 1 + README.md | 2 +- bin/test-release.sh | 2 +- build.sbt | 12 ++++++++++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0ee9612..731ae6ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: { version: '2.12.10' }, { version: '2.12.9' }, { version: '2.12.8' }, + { version: '2.13.6' }, { version: '2.13.5' }, { version: '2.13.4' }, { version: '2.13.3' }, diff --git a/README.md b/README.md index 5ed2e130..2b794617 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Maven Central](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|ga|1|g%3A%22org.scoverage%22%20AND%20a%3A%22scalac-scoverage-plugin_2.10%22) [![Maven Central](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|ga|1|g%3A%22org.scoverage%22%20AND%20a%3A%22scalac-scoverage-plugin_2.11%22) [![Maven Central](https://img.shields.io/maven-central/v/org.scoverage/scalac-scoverage-plugin_2.12.13.svg?label=latest%202.12%20Scala%20support%20[2.12.13]%20and%20latest%20version)](http://search.maven.org/#search|ga|1|g%3A%22org.scoverage%22%20AND%20a%3A%22scalac-scoverage-plugin_2.12.13%22) -[![Maven Central](https://img.shields.io/maven-central/v/org.scoverage/scalac-scoverage-plugin_2.13.5.svg?label=latest%202.13%20Scala%20support%20[2.13.5]%20and%20version)](http://search.maven.org/#search|ga|1|g%3A%22org.scoverage%22%20AND%20a%3A%22scalac-scoverage-plugin_2.13.5%22) +[![Maven Central](https://img.shields.io/maven-central/v/org.scoverage/scalac-scoverage-plugin_2.13.6.svg?label=latest%202.13%20Scala%20support%20[2.13.6]%20and%20version)](http://search.maven.org/#search|ga|1|g%3A%22org.scoverage%22%20AND%20a%3A%22scalac-scoverage-plugin_2.13.6%22) [![License](http://img.shields.io/:license-Apache%202-red.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) scoverage is a free Apache licensed code coverage tool for Scala that offers diff --git a/bin/test-release.sh b/bin/test-release.sh index 17b4c039..b7d29acf 100755 --- a/bin/test-release.sh +++ b/bin/test-release.sh @@ -15,7 +15,7 @@ coursier fetch \ org.scoverage:scalac-scoverage-plugin_2.13.3:$version \ org.scoverage:scalac-scoverage-plugin_2.13.4:$version \ org.scoverage:scalac-scoverage-plugin_2.13.5:$version \ - org.scoverage:scalac-scoverage-plugin_2.13.5:$version \ + org.scoverage:scalac-scoverage-plugin_2.13.6:$version \ org.scoverage:scalac-scoverage-runtime_2.12:$version \ org.scoverage:scalac-scoverage-runtime_2.13:$version \ org.scoverage:scalac-scoverage-runtime_sjs1_2.12:$version \ diff --git a/build.sbt b/build.sbt index cf5fd956..b9640d81 100644 --- a/build.sbt +++ b/build.sbt @@ -2,10 +2,18 @@ import sbtcrossproject.CrossProject import sbtcrossproject.CrossType val scalatestVersion = "3.2.9" -val defaultScala213 = "2.13.5" +val defaultScala213 = "2.13.6" val bin212 = Seq("2.12.13", "2.12.12", "2.12.11", "2.12.10", "2.12.9", "2.12.8") val bin213 = - Seq(defaultScala213, "2.13.4", "2.13.3", "2.13.2", "2.13.1", "2.13.0") + Seq( + defaultScala213, + "2.13.5", + "2.13.4", + "2.13.3", + "2.13.2", + "2.13.1", + "2.13.0" + ) inThisBuild( List( From 26f432e443edbe129ef0874cd82740c4026587c5 Mon Sep 17 00:00:00 2001 From: Dragisa Krsmanovic Date: Tue, 18 May 2021 12:15:17 -0700 Subject: [PATCH 2/2] fix formatting --- build.sbt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index b9640d81..50579c11 100644 --- a/build.sbt +++ b/build.sbt @@ -5,15 +5,7 @@ val scalatestVersion = "3.2.9" val defaultScala213 = "2.13.6" val bin212 = Seq("2.12.13", "2.12.12", "2.12.11", "2.12.10", "2.12.9", "2.12.8") val bin213 = - Seq( - defaultScala213, - "2.13.5", - "2.13.4", - "2.13.3", - "2.13.2", - "2.13.1", - "2.13.0" - ) + Seq(defaultScala213, "2.13.5", "2.13.4", "2.13.3", "2.13.2", "2.13.1", "2.13.0") inThisBuild( List(