From 2d8486f9729ffe8ee3f9ec7445a61fd7ea03c218 Mon Sep 17 00:00:00 2001 From: ckipp01 Date: Mon, 26 Apr 2021 16:49:09 +0200 Subject: [PATCH 1/2] Bump scalac-scoverage-plugin version --- build.sbt | 2 +- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 47923c9f..0ddbfc0e 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ resolvers ++= { if (isSnapshot.value) Seq(Resolver.sonatypeRepo("snapshots")) else Nil } -libraryDependencies += "org.scoverage" %% "scalac-scoverage-plugin" % "1.4.0" +libraryDependencies += "org.scoverage" %% "scalac-scoverage-plugin" % "1.4.2" publishMavenStyle := true diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index bf197e3d..243bbc95 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -11,7 +11,7 @@ object ScoverageSbtPlugin extends AutoPlugin { val ScalacRuntimeArtifact = "scalac-scoverage-runtime" val ScalacPluginArtifact = "scalac-scoverage-plugin" // this should match the version defined in build.sbt - val DefaultScoverageVersion = "1.4.1" + val DefaultScoverageVersion = "1.4.2" val autoImport = ScoverageKeys lazy val ScoveragePluginConfig = config("scoveragePlugin").hide From 7a17425ad574c0bca53ab29962b1d1a37ed5d98f Mon Sep 17 00:00:00 2001 From: ckipp01 Date: Tue, 27 Apr 2021 18:46:25 +0200 Subject: [PATCH 2/2] wip --- .github/workflows/pr.yml | 10 +--------- build.sbt | 5 +++-- project/build.properties | 2 +- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 15 ++++++++------- src/sbt-test/scoverage/aggregate-only/build.sbt | 2 +- src/sbt-test/scoverage/aggregate/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage/build.sbt | 2 +- src/sbt-test/scoverage/coverage-off/build.sbt | 2 +- src/sbt-test/scoverage/good-coverage/build.sbt | 2 +- src/sbt-test/scoverage/preserve-set/build.sbt | 4 ++-- src/sbt-test/scoverage/preserve-set/test | 4 ++-- src/sbt-test/scoverage/scalajs/build.sbt | 5 ++--- .../scoverage/scalajs/project/plugins.sbt | 4 ++-- .../sjstest/js/src/test/scala/JsTest.scala | 5 +++-- .../sjstest/jvm/src/test/scala/JvmTest.scala | 5 +++-- .../shared/src/test/scala/SharedTest.scala | 5 +++-- version.sbt | 2 +- 17 files changed, 36 insertions(+), 40 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0586c18d..d41348e4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,15 +14,7 @@ jobs: matrix: java: [ '11' ] scala: [ - { version: '2.12.13' }, - { version: '2.12.12' }, - { version: '2.12.11' }, - { version: '2.12.10' }, - { version: '2.13.4' }, - { version: '2.13.3' }, - { version: '2.13.2' }, - { version: '2.13.1' }, - { version: '2.13.0' } + { version: '2.12.13' } ] steps: - name: checkout the repo diff --git a/build.sbt b/build.sbt index 0ddbfc0e..19a70bb0 100644 --- a/build.sbt +++ b/build.sbt @@ -10,11 +10,12 @@ resolvers ++= { if (isSnapshot.value) Seq(Resolver.sonatypeRepo("snapshots")) else Nil } -libraryDependencies += "org.scoverage" %% "scalac-scoverage-plugin" % "1.4.2" +libraryDependencies += + "org.scoverage" %% "scalac-scoverage-plugin" % "1.4.3-SNAPSHOT" cross CrossVersion.full publishMavenStyle := true -publishArtifact in Test := false +Test / publishArtifact := false scriptedLaunchOpts ++= Seq( "-Xmx1024M", diff --git a/project/build.properties b/project/build.properties index c0bab049..f0be67b9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.5.1 diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index 243bbc95..816e394b 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -11,7 +11,7 @@ object ScoverageSbtPlugin extends AutoPlugin { val ScalacRuntimeArtifact = "scalac-scoverage-runtime" val ScalacPluginArtifact = "scalac-scoverage-plugin" // this should match the version defined in build.sbt - val DefaultScoverageVersion = "1.4.2" + val DefaultScoverageVersion = "1.4.3-SNAPSHOT" val autoImport = ScoverageKeys lazy val ScoveragePluginConfig = config("scoveragePlugin").hide @@ -48,7 +48,7 @@ object ScoverageSbtPlugin extends AutoPlugin { ivyConfigurations += ScoveragePluginConfig, coverageReport := coverageReport0.value, coverageAggregate := coverageAggregate0.value, - aggregate in coverageAggregate := false + coverageAggregate / aggregate := false ) ++ coverageSettings ++ scalacSettings private lazy val coverageSettings = Seq( @@ -57,7 +57,8 @@ object ScoverageSbtPlugin extends AutoPlugin { Seq( // We only add for "compile" because of macros. This setting could be optimed to just "test" if the handling // of macro coverage was improved. - (OrgScoverage %% (scalacRuntime(libraryDependencies.value)) % coverageScalacPluginVersion.value).cross(CrossVersion.full), + (OrgScoverage %% ScalacRuntimeArtifact % coverageScalacPluginVersion.value).cross(CrossVersion.full), + //(OrgScoverage %% (scalacRuntime(libraryDependencies.value)) % coverageScalacPluginVersion.value).cross(CrossVersion.full), // We don't want to instrument the test code itself, nor add to a pom when published with coverage enabled. (OrgScoverage %% ScalacPluginArtifact % coverageScalacPluginVersion.value % ScoveragePluginConfig.name).cross(CrossVersion.full) ) @@ -67,7 +68,7 @@ object ScoverageSbtPlugin extends AutoPlugin { ) private lazy val scalacSettings = Seq( - scalacOptions in(Compile, compile) ++= { + Compile / compile / scalacOptions ++= { val updateReport = update.value if (coverageEnabled.value) { val scoverageDeps: Seq[File] = updateReport matching configurationFilter(ScoveragePluginConfig.name) @@ -113,14 +114,14 @@ object ScoverageSbtPlugin extends AutoPlugin { case Some(cov) => writeReports( target, - (sourceDirectories in Compile).value, + (Compile / sourceDirectories).value, cov, coverageOutputCobertura.value, coverageOutputXML.value, coverageOutputHTML.value, coverageOutputDebug.value, coverageOutputTeamCity.value, - sourceEncoding((scalacOptions in (Compile)).value), + sourceEncoding((Compile / scalacOptions).value), log) checkCoverage(cov, log, coverageMinimum.value, coverageFailOnMinimum.value) @@ -144,7 +145,7 @@ object ScoverageSbtPlugin extends AutoPlugin { coverageOutputHTML.value, coverageOutputDebug.value, coverageOutputTeamCity.value, - sourceEncoding((scalacOptions in (Compile)).value), + sourceEncoding((Compile / scalacOptions).value), log) val cfmt = cov.statementCoverageFormatted log.info(s"Aggregation complete. Coverage was [$cfmt]") diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index 9036ce72..2eff4698 100644 --- a/src/sbt-test/scoverage/aggregate-only/build.sbt +++ b/src/sbt-test/scoverage/aggregate-only/build.sbt @@ -6,7 +6,7 @@ lazy val commonSettings = Seq( organization := "org.scoverage", version := "0.1.0", - scalaVersion := "2.12.8" + scalaVersion := "2.12.13" ) lazy val specs2Lib = "org.specs2" %% "specs2" % "2.5" % "test" diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt index 9036ce72..2eff4698 100644 --- a/src/sbt-test/scoverage/aggregate/build.sbt +++ b/src/sbt-test/scoverage/aggregate/build.sbt @@ -6,7 +6,7 @@ lazy val commonSettings = Seq( organization := "org.scoverage", version := "0.1.0", - scalaVersion := "2.12.8" + scalaVersion := "2.12.13" ) lazy val specs2Lib = "org.specs2" %% "specs2" % "2.5" % "test" diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index c786340d..41458cd7 100644 --- a/src/sbt-test/scoverage/bad-coverage/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.12.8" +scalaVersion := "2.12.13" libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test" diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt index c786340d..41458cd7 100644 --- a/src/sbt-test/scoverage/coverage-off/build.sbt +++ b/src/sbt-test/scoverage/coverage-off/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.12.8" +scalaVersion := "2.12.13" libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test" diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt index c786340d..41458cd7 100644 --- a/src/sbt-test/scoverage/good-coverage/build.sbt +++ b/src/sbt-test/scoverage/good-coverage/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.12.8" +scalaVersion := "2.12.13" libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test" diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt index 8469864d..d8d89afd 100644 --- a/src/sbt-test/scoverage/preserve-set/build.sbt +++ b/src/sbt-test/scoverage/preserve-set/build.sbt @@ -2,9 +2,9 @@ import sbt.complete.DefaultParsers._ version := "0.1" -scalaVersion := "2.12.8" +scalaVersion := "2.12.13" -crossScalaVersions := Seq("2.10.6", "2.12.8") +crossScalaVersions := Seq("2.10.6", "2.12.13") libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test" diff --git a/src/sbt-test/scoverage/preserve-set/test b/src/sbt-test/scoverage/preserve-set/test index 2429a4dd..8544b8e1 100644 --- a/src/sbt-test/scoverage/preserve-set/test +++ b/src/sbt-test/scoverage/preserve-set/test @@ -1,10 +1,10 @@ # check scalaVersion setting -> checkScalaVersion "2.12.8" +> checkScalaVersion "2.12.13" > checkScoverageEnabled "false" > coverage > checkScoverageEnabled "true" > coverageOff -> checkScalaVersion "2.12.8" +> checkScalaVersion "2.12.13" > checkScoverageEnabled "false" # changs scala version > ++2.10.6 diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt index 4f26c791..e692d4f1 100644 --- a/src/sbt-test/scoverage/scalajs/build.sbt +++ b/src/sbt-test/scoverage/scalajs/build.sbt @@ -4,11 +4,10 @@ import sbtcrossproject.CrossType lazy val root = (project in file(".")).aggregate(crossJS, crossJVM) lazy val cross = CrossProject("sjstest", file("sjstest"))(JVMPlatform, JSPlatform) - .crossType(CrossType.Full) .settings( - scalaVersion := "2.12.8", + scalaVersion := "2.13.5", libraryDependencies ++= Seq( - "org.scalatest" %%% "scalatest" % "3.0.0" % "test" + "org.scalatest" %%% "scalatest" % "3.2.8" % "test" ) ) diff --git a/src/sbt-test/scoverage/scalajs/project/plugins.sbt b/src/sbt-test/scoverage/scalajs/project/plugins.sbt index 0b681ffe..7687f56d 100644 --- a/src/sbt-test/scoverage/scalajs/project/plugins.sbt +++ b/src/sbt-test/scoverage/scalajs/project/plugins.sbt @@ -13,6 +13,6 @@ resolvers ++= { Seq.empty } -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") diff --git a/src/sbt-test/scoverage/scalajs/sjstest/js/src/test/scala/JsTest.scala b/src/sbt-test/scoverage/scalajs/sjstest/js/src/test/scala/JsTest.scala index 133c1a36..d11e4236 100644 --- a/src/sbt-test/scoverage/scalajs/sjstest/js/src/test/scala/JsTest.scala +++ b/src/sbt-test/scoverage/scalajs/sjstest/js/src/test/scala/JsTest.scala @@ -1,6 +1,7 @@ -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class JsTest extends FlatSpec with Matchers { +class JsTest extends AnyFlatSpec with Matchers { "JS UnderTest" should "work on JS" in { UnderTest.jsMethod shouldBe "js" diff --git a/src/sbt-test/scoverage/scalajs/sjstest/jvm/src/test/scala/JvmTest.scala b/src/sbt-test/scoverage/scalajs/sjstest/jvm/src/test/scala/JvmTest.scala index 80739a94..be2bc649 100644 --- a/src/sbt-test/scoverage/scalajs/sjstest/jvm/src/test/scala/JvmTest.scala +++ b/src/sbt-test/scoverage/scalajs/sjstest/jvm/src/test/scala/JvmTest.scala @@ -1,6 +1,7 @@ -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class JvmTest extends FlatSpec with Matchers { +class JvmTest extends AnyFlatSpec with Matchers { "JVM UnderTest" should "work on JVM" in { UnderTest.jvmMethod shouldBe "jvm" diff --git a/src/sbt-test/scoverage/scalajs/sjstest/shared/src/test/scala/SharedTest.scala b/src/sbt-test/scoverage/scalajs/sjstest/shared/src/test/scala/SharedTest.scala index fecebac8..8336af72 100644 --- a/src/sbt-test/scoverage/scalajs/sjstest/shared/src/test/scala/SharedTest.scala +++ b/src/sbt-test/scoverage/scalajs/sjstest/shared/src/test/scala/SharedTest.scala @@ -1,6 +1,7 @@ -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class SharedTest extends FlatSpec with Matchers { +class SharedTest extends AnyFlatSpec with Matchers { "Shared UnderTest" should "return where it works" in { UnderTest.onJsAndJvm shouldBe "js and jvm" diff --git a/version.sbt b/version.sbt index e5cd55e1..50723605 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.6.2-SNAPSHOT" +(ThisBuild / version) := "1.6.2-SNAPSHOT"