diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd01e9f4..db03f72c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: java-version: ${{ matrix.java }} - name: Run tests - run: sbt scripted + run: sbt scripted "++ 3.x" test formatting: runs-on: ubuntu-latest @@ -52,4 +52,4 @@ jobs: - uses: sbt/setup-sbt@v1 - name: Check Formatting - run: sbt scalafmtSbtCheck scalafmtCheckAll + run: sbt scalafmtSbtCheck "+ scalafmtCheckAll" diff --git a/.scalafmt.conf b/.scalafmt.conf index cba3213f..a834d75a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.8.3" +version = "3.9.4" project.git = true runner.dialect = "scala213" diff --git a/build.sbt b/build.sbt index e61d8375..0d9bbf6f 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "sbt-scoverage" import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts -lazy val scoverageVersion = "2.2.1" +lazy val scoverageVersion = "2.3.0" inThisBuild( List( @@ -32,15 +32,25 @@ inThisBuild( lazy val root = Project("sbt-scoverage", file(".")) .enablePlugins(SbtPlugin, BuildInfoPlugin) .settings( + crossScalaVersions += "3.6.2", libraryDependencies ++= Seq( "org.scoverage" %% "scalac-scoverage-reporter" % scoverageVersion ), + pluginCrossBuild / sbtVersion := { + scalaBinaryVersion.value match { + case "2.12" => + (pluginCrossBuild / sbtVersion).value + case _ => + "2.0.0-M3" + } + }, buildInfoKeys := Seq[BuildInfoKey]("scoverageVersion" -> scoverageVersion), buildInfoPackage := "scoverage", Test / fork := false, Test / publishArtifact := false, Test / parallelExecution := false, scalacOptions := Seq( + "-language:implicitConversions", "-unchecked", "-deprecation", "-feature", diff --git a/project/build.properties b/project/build.properties index 04267b14..cc68b53f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.11 diff --git a/project/plugins.sbt b/project/plugins.sbt index 00d345f6..86a78031 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.8.0") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index 3fb50486..b5ac6601 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -1,7 +1,7 @@ package scoverage import sbt.Keys._ -import sbt._ +import sbt.{given, _} import sbt.internal.util.Util.isWindows import sbt.plugins.JvmPlugin import scoverage.reporter.CoberturaXmlWriter @@ -124,7 +124,7 @@ object ScoverageSbtPlugin extends AutoPlugin { private lazy val scalacSettings = Seq( Compile / compile / scalacOptions ++= { - implicit val log = streams.value.log + implicit val log: Logger = streams.value.log val excludedPackages = Option(coverageExcludedPackages.value.trim).filter(_.nonEmpty) @@ -175,7 +175,7 @@ object ScoverageSbtPlugin extends AutoPlugin { s"-Xplugin:${pluginPaths.mkString(java.io.File.pathSeparator)}" ), Some( - s"-P:scoverage:dataDir:${coverageDataDir.value.getAbsolutePath}/scoverage-data" + s"-P:scoverage:dataDir:${new java.io.File(coverageDataDir.value, "scoverage-data").getAbsolutePath}" ), Some( s"-P:scoverage:sourceRoot:${coverageSourceRoot.value.getAbsolutePath}" @@ -191,7 +191,7 @@ object ScoverageSbtPlugin extends AutoPlugin { ) { Seq( Some( - s"-coverage-out:${coverageDataDir.value.getAbsolutePath()}/scoverage-data" + s"-coverage-out:${new java.io.File(coverageDataDir.value, "scoverage-data").getAbsolutePath}" ), excludedPackages .collect { @@ -241,7 +241,7 @@ object ScoverageSbtPlugin extends AutoPlugin { private lazy val coverageReport0 = Def.task { val target = coverageDataDir.value - implicit val log = streams.value.log + implicit val log: Logger = streams.value.log log.info(s"Waiting for measurement data to sync...") if (System.getProperty("os.name").toLowerCase.contains("windows")) { @@ -276,7 +276,7 @@ object ScoverageSbtPlugin extends AutoPlugin { } private lazy val coverageAggregate0 = Def.task { - implicit val log = streams.value.log + implicit val log: Logger = streams.value.log log.info(s"Aggregating coverage from subprojects...") val dataDirs = coverageDataDir.?.all(aggregateFilter).value diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt index 102747d4..df04514c 100644 --- a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt +++ b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt @@ -1,8 +1,8 @@ inThisBuild( List( organization := "org.scoverage", - scalaVersion := "2.13.15", - libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test + scalaVersion := "2.13.16", + libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test ) ) diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index ba5b2b66..be809289 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.13.15" + scalaVersion := "2.13.16" ) def module(name: String) = { @@ -15,7 +15,7 @@ def module(name: String) = { .settings(commonSettings: _*) .settings( Keys.name := name, - libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test + libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test ) } diff --git a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt index 9bddee58..8c0839c3 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumBranchPerFile := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt index 5e51409f..9ac10058 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumStmtPerFile := 90 diff --git a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt index 63014f5e..1ffbc32c 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumBranchPerPackage := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt index 1686a4cd..8c28c01c 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumStmtPerPackage := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt index 791aa3d2..6fa49e43 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumBranchTotal := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt index 11a8bf05..b771e808 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumStmtTotal := 80 diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index 66488319..0ae6e541 100644 --- a/src/sbt-test/scoverage/bad-coverage/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumStmtTotal := 80 diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt index 570c2dad..4212ee1b 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageExcludedPackages := "two\\..*;three\\..*" diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt index 29c7f973..89d4bf29 100644 --- a/src/sbt-test/scoverage/coverage-off/build.sbt +++ b/src/sbt-test/scoverage/coverage-off/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumStmtTotal := 100 coverageMinimumBranchTotal := 100 diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt index 29c7f973..89d4bf29 100644 --- a/src/sbt-test/scoverage/good-coverage/build.sbt +++ b/src/sbt-test/scoverage/good-coverage/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test coverageMinimumStmtTotal := 100 coverageMinimumBranchTotal := 100 diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt index ca678e70..83f42cab 100644 --- a/src/sbt-test/scoverage/preserve-set/build.sbt +++ b/src/sbt-test/scoverage/preserve-set/build.sbt @@ -2,11 +2,11 @@ import sbt.complete.DefaultParsers._ version := "0.1" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" -crossScalaVersions := Seq("2.13.15") +crossScalaVersions := Seq("2.13.16") -libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test val checkScalaVersion = inputKey[Unit]( "Input task to compare the value of scalaVersion setting with a given input." diff --git a/src/sbt-test/scoverage/preserve-set/test b/src/sbt-test/scoverage/preserve-set/test index e30f7afd..6b815906 100644 --- a/src/sbt-test/scoverage/preserve-set/test +++ b/src/sbt-test/scoverage/preserve-set/test @@ -1,8 +1,8 @@ # check scalaVersion setting -> checkScalaVersion "2.13.15" +> checkScalaVersion "2.13.16" > checkScoverageEnabled "false" > coverage > checkScoverageEnabled "true" > coverageOff -> checkScalaVersion "2.13.15" +> checkScalaVersion "2.13.16" > checkScoverageEnabled "false" diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt index 284d6494..e5c5ea09 100644 --- a/src/sbt-test/scoverage/scalajs/build.sbt +++ b/src/sbt-test/scoverage/scalajs/build.sbt @@ -7,8 +7,8 @@ lazy val cross = CrossProject("sjstest", file("sjstest"))(JVMPlatform, JSPlatform) .crossType(CrossType.Full) .settings( - scalaVersion := "2.13.15", - libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test + scalaVersion := "2.13.16", + libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test ) lazy val crossJS = cross.js diff --git a/src/sbt-test/scoverage/scalajs/project/plugins.sbt b/src/sbt-test/scoverage/scalajs/project/plugins.sbt index 004b68c3..dd6dc4ad 100644 --- a/src/sbt-test/scoverage/scalajs/project/plugins.sbt +++ b/src/sbt-test/scoverage/scalajs/project/plugins.sbt @@ -15,6 +15,6 @@ resolvers ++= { Seq.empty } -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")