From e1df4f7c8bf15a21706c3d47c2a55407dff1dc63 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Jun 2024 22:15:40 +0000 Subject: [PATCH 01/51] Update scalafmt-core to 3.8.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 8edb48b7..61c08776 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.8.1" +version = "3.8.2" project.git = true runner.dialect = "scala213" From 76a39fb1203cd417e298b97e59f744d29525bbc6 Mon Sep 17 00:00:00 2001 From: Eugene Platonov Date: Wed, 19 Jun 2024 17:58:58 -0400 Subject: [PATCH 02/51] Support file and package exclusions for Scala 3.4.2+ --- README.md | 5 +- .../scala/scoverage/ScoverageSbtPlugin.scala | 69 +++++++++++++------ .../scala3-coverage-excluded-files/build.sbt | 2 +- .../scala3-coverage-excluded-files/test | 4 +- .../build.sbt | 13 ++++ .../project/build.properties | 1 + .../project/plugins.sbt | 16 +++++ .../src/main/scala/GoodCoverage.scala | 7 ++ .../src/main/scala/two/GoodCoverage.scala | 9 +++ .../src/test/scala/GoodCoverageSpec.scala | 19 +++++ .../scala3-coverage-excluded-packages/test | 7 ++ 11 files changed, 126 insertions(+), 26 deletions(-) create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/build.properties create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/plugins.sbt create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/test diff --git a/README.md b/README.md index 5b54bcbf..107ba4f0 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,7 @@ coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" Note: The `.scala` file extension needs to be omitted from the filename, if one is given. -Note: These two options only work for Scala2. Right now Scala3 does not support -a way to exclude packages or files from being instrumented. +Note: These two options only work for Scala2 and Scala 3.4.2+. You can also mark sections of code with comments like: @@ -104,6 +103,8 @@ You can also mark sections of code with comments like: Any code between two such comments will not be instrumented or included in the coverage report. +Note: Comments exclusion works only for Scala2. + ### Minimum coverage Based on minimum coverage, you can fail the build with the following keys: diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index a7a22add..feba91ba 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -75,18 +75,28 @@ object ScoverageSbtPlugin extends AutoPlugin { private def isScala2(scalaVersion: String) = CrossVersion .partialVersion(scalaVersion) - .collect { case (2, _) => - true + .exists { + case (2, _) => true + case _ => false } - .getOrElse(false) private def isScala3SupportingScoverage(scalaVersion: String) = CrossVersion .partialVersion(scalaVersion) - .collect { + .exists { case (3, minor) if minor >= 2 => true + case _ => false + } + + private def isScala3SupportingFilePackageExclusion(scalaVersion: String) = { + def patch = scalaVersion.split('.').drop(2).headOption + CrossVersion + .partialVersion(scalaVersion) + .exists { + case (3, minor) if minor >= 4 && patch.exists(_ >= "2") => true + case _ => false } - .getOrElse(false) + } private lazy val coverageSettings = Seq( libraryDependencies ++= { @@ -114,6 +124,18 @@ object ScoverageSbtPlugin extends AutoPlugin { implicit val log = streams.value.log + val excludedPackages = + Option(coverageExcludedPackages.value.trim).filter(_.nonEmpty) + val excludedFiles = Option(coverageExcludedFiles.value.trim) + .filter(_.nonEmpty) + .map(v => + // On windows, replace unix file separators with windows file + // separators. Note that we need to replace / with \\ because + // the plugin treats this string as a regular expression and + // backslashes must be escaped in regular expressions. + if (isWindows) v.replace("/", """\\""") else v + ) + val updateReport = update.value if (coverageEnabled.value && isScala2(scalaVersion.value)) { val scoverageDeps: Seq[File] = @@ -156,19 +178,8 @@ object ScoverageSbtPlugin extends AutoPlugin { Some( s"-P:scoverage:sourceRoot:${coverageSourceRoot.value.getAbsolutePath}" ), - Option(coverageExcludedPackages.value.trim) - .filter(_.nonEmpty) - .map(v => s"-P:scoverage:excludedPackages:$v"), - Option(coverageExcludedFiles.value.trim) - .filter(_.nonEmpty) - .map(v => - // On windows, replace unix file separators with windows file - // separators. Note that we need to replace / with \\ because - // the plugin treats this string as a regular expression and - // backslashes must be escaped in regular expressions. - if (isWindows) v.replace("/", """\\""") else v - ) - .map(v => s"-P:scoverage:excludedFiles:$v"), + excludedPackages.map(v => s"-P:scoverage:excludedPackages:$v"), + excludedFiles.map(v => s"-P:scoverage:excludedFiles:$v"), Some("-P:scoverage:reportTestName"), // rangepos is broken in some releases of scala so option to turn it off if (coverageHighlighting.value) Some("-Yrangepos") else None @@ -177,8 +188,26 @@ object ScoverageSbtPlugin extends AutoPlugin { coverageEnabled.value && isScala3SupportingScoverage(scalaVersion.value) ) { Seq( - s"-coverage-out:${coverageDataDir.value.getAbsolutePath()}/scoverage-data" - ) + Some( + s"-coverage-out:${coverageDataDir.value.getAbsolutePath()}/scoverage-data" + ), + excludedPackages + .collect { + case v + if isScala3SupportingFilePackageExclusion( + scalaVersion.value + ) => + s"-coverage-exclude-classlikes:$v" + }, + excludedFiles + .collect { + case v + if isScala3SupportingFilePackageExclusion( + scalaVersion.value + ) => + s"-coverage-exclude-files:$v" + } + ).flatten } else if (coverageEnabled.value && !isScala2(scalaVersion.value)) { log.warn( "coverage in Scala 3 needs at least 3.2.x. Please update your Scala version and try again." diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt index 939f7489..fef0a139 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "3.2.0-RC1" +scalaVersion := "3.4.2" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test index b19476ca..08688334 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test @@ -4,6 +4,4 @@ > test > coverageReport # There should be no directory for the excluded files -#-$ exists target/scala-3.2.0-RC1/scoverage-report/two -# But right now there is, because Scala3 does not support excluding files -$ exists target/scala-3.2.0-RC1/scoverage-report/two +-$ exists target/scala-3.4.2/scoverage-report/two \ No newline at end of file diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt new file mode 100644 index 00000000..083a1e20 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt @@ -0,0 +1,13 @@ +version := "0.1" + +scalaVersion := "3.4.2" + +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test + +coverageExcludedPackages := "two\\..*" + +resolvers ++= { + if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) + Seq(Resolver.sonatypeRepo("snapshots")) + else Seq.empty +} diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/build.properties b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/build.properties new file mode 100644 index 00000000..04267b14 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/plugins.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/plugins.sbt new file mode 100644 index 00000000..8d349239 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/project/plugins.sbt @@ -0,0 +1,16 @@ +val pluginVersion = sys.props.getOrElse( + "plugin.version", + throw new RuntimeException( + """|The system property 'plugin.version' is not defined. + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) + +addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) + +resolvers ++= { + if (pluginVersion.endsWith("-SNAPSHOT")) + Seq(Resolver.sonatypeRepo("snapshots")) + else + Seq.empty +} diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/GoodCoverage.scala b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/GoodCoverage.scala new file mode 100644 index 00000000..ac6582bb --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/GoodCoverage.scala @@ -0,0 +1,7 @@ +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala new file mode 100644 index 00000000..587e11e1 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala @@ -0,0 +1,9 @@ +package two + +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala new file mode 100644 index 00000000..44eec1c9 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala @@ -0,0 +1,19 @@ +import munit.FunSuite + +/** Created by tbarke001c on 7/8/14. + */ +class GoodCoverageSpec extends FunSuite { + + test("GoodCoverage should sum two numbers") { + assertEquals(GoodCoverage.sum(1, 2), 3) + assertEquals(GoodCoverage.sum(0, 3), 3) + assertEquals(GoodCoverage.sum(3, 0), 3) + } + + test("two.GoodCoverage should sum two numbers") { + assertEquals(two.GoodCoverage.sum(1, 2), 3) + assertEquals(two.GoodCoverage.sum(0, 3), 3) + assertEquals(two.GoodCoverage.sum(3, 0), 3) + } + +} diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test new file mode 100644 index 00000000..e611b048 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test @@ -0,0 +1,7 @@ +# run scoverage using the coverage task +> clean +> coverage +> test +> coverageReport +# There should be no directory for the excluded package +-$ exists target/scala-3.4.2/scoverage-report/two From 2118fda70ebe9e6a36f2130639feb31ed4a9b150 Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Tue, 23 Jul 2024 04:18:09 +0100 Subject: [PATCH 03/51] README: Fix maven-central badge to show correct version. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 107ba4f0..25cd9c03 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # sbt-scoverage [![Gitter](https://img.shields.io/gitter/room/scoverage/scoverage.svg)](https://gitter.im/scoverage/scoverage) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.scoverage/sbt-scoverage/badge.svg?kill_cache=1)](https://search.maven.org/artifact/org.scoverage/sbt-scoverage/) +[![Maven Central](https://img.shields.io/github/v/release/scoverage/sbt-scoverage?label=maven-central)](https://search.maven.org/artifact/org.scoverage/sbt-scoverage/) [![License](http://img.shields.io/:license-Apache%202-red.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) sbt-scoverage is an sbt plugin that offers support for Scala code coverage using @@ -11,7 +11,6 @@ supports Scala 2.12, 2.13, and 3. **NOTE**: that ScalaJS and Scala Native support is limited to Scala 2. **NOTE**: that Scala 3 support starts with 3.2.x. - ## Setup **Requirements**: Requires sbt 1.2.8 or above From 9adae9a889e26bf86765a6e9a221503e15eb347f Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Tue, 23 Jul 2024 15:34:02 +0100 Subject: [PATCH 04/51] README: Fix maven badge. Use footnotes for links. Reformat/Refresh. --- README.md | 143 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 25cd9c03..109dc5ef 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,20 @@ # sbt-scoverage -[![Gitter](https://img.shields.io/gitter/room/scoverage/scoverage.svg)](https://gitter.im/scoverage/scoverage) -[![Maven Central](https://img.shields.io/github/v/release/scoverage/sbt-scoverage?label=maven-central)](https://search.maven.org/artifact/org.scoverage/sbt-scoverage/) -[![License](http://img.shields.io/:license-Apache%202-red.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) +[![gitter-badge][]][gitter] +[![maven-badge][]][maven] +[![license-badge][]][license] -sbt-scoverage is an sbt plugin that offers support for Scala code coverage using -[scoverage](https://github.com/scoverage/scalac-scoverage-plugin). This plugin -supports Scala 2.12, 2.13, and 3. +sbt-scoverage is an sbt plugin that offers support for Scala code +coverage using [scoverage][]. This plugin supports Scala 2.12, 2.13, +and 3. -**NOTE**: that ScalaJS and Scala Native support is limited to Scala 2. -**NOTE**: that Scala 3 support starts with 3.2.x. +**NOTE**: ScalaJS and Scala Native support is limited to Scala 2. + +**NOTE**: Scala 3 support starts with 3.2.x. ## Setup -**Requirements**: Requires sbt 1.2.8 or above +**Requirements**: Requires sbt 1.2.8 or above. In `project/plugins.sbt`: ```scala @@ -46,40 +47,43 @@ To generate the coverage reports run sbt coverageReport ``` -Coverage reports will be in your `target/scala-/scoverage-report` -directory. There are HTML and XML reports. The XML is useful if you need to -programatically use the results, or if you're writing a tool. +Coverage reports will be in your +`target/scala-/scoverage-report` directory. There are +HTML and XML reports. The XML is useful if you need to programatically +use the results, or if you're writing a tool. -**NOTE**: If you're running the coverage reports from within an sbt console -session (as opposed to one command per sbt launch), then the `coverage` command -is sticky. To turn it back off when you're done running reports, use the -`coverageOff` command or reset `coverageEnabled` with `set coverageEnabled := -false`. +**NOTE**: If you're running the coverage reports from within an sbt +console session (as opposed to one command per sbt launch), then the +`coverage` command is sticky. To turn it back off when you're done +running reports, use the `coverageOff` command or reset +`coverageEnabled` with `set coverageEnabled := false`. ### Multi project reports -By default, scoverage will generate reports for each project separately. You can -merge them into an aggregated report by using the following: +By default, scoverage will generate reports for each project +separately. You can merge them into an aggregated report by using the +following: ``` $ sbt coverageAggregate ``` -**NOTE**: You do not need to run `coverageReport` before `coverageAggregate`; it -aggregates over the sub-projects' coverage data directly, not the report xml. +**NOTE**: You do not need to run `coverageReport` before +`coverageAggregate`; it aggregates over the sub-projects' coverage +data directly, not the report xml. ### Exclude classes and packages and files -You can exclude classes from being considered for coverage measurement by -providing semicolon-separated list of regular expressions. +You can exclude classes from being considered for coverage measurement +by providing semicolon-separated list of regular expressions. ```scala coverageExcludedPackages := ";Reverse.*;.*AuthService.*;models\\.data\\..*" ``` -The regular expressions are matched against the fully qualified class name, and -must match the entire string to take effect. Any matched classes will not be -instrumented or included in the coverage report. +The regular expressions are matched against the fully qualified class +name, and must match the entire string to take effect. Any matched +classes will not be instrumented or included in the coverage report. You can also exclude files and file paths. @@ -87,9 +91,10 @@ You can also exclude files and file paths. coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" ``` -Note: The `.scala` file extension needs to be omitted from the filename, if one is given. +**NOTE**: The `.scala` file extension needs to be omitted from the +filename, if one is given. -Note: These two options only work for Scala2 and Scala 3.4.2+. +**NOTE**: These two options only work for Scala2 and Scala 3.4.2+. You can also mark sections of code with comments like: @@ -102,7 +107,7 @@ You can also mark sections of code with comments like: Any code between two such comments will not be instrumented or included in the coverage report. -Note: Comments exclusion works only for Scala2. +**NOTE**: Comments exclusion works only for Scala2. ### Minimum coverage @@ -118,13 +123,14 @@ coverageMinimumStmtPerFile := 85 coverageMinimumBranchPerFile := 80 ``` -These settings will be enforced when the reports are generated. If you generate -an aggregate report using `coverageAggregate` then these settings will apply to -that report. +These settings will be enforced when the reports are generated. If +you generate an aggregate report using `coverageAggregate` then these +settings will apply to that report. ### Override Location for Coverage Data And Report -If desired, one could override the default location for generating the sbt report and data through setting `coverageDataDir`: +If desired, one could override the default location for generating the +sbt report and data through setting `coverageDataDir`: Example in data-dir test: ```scala @@ -138,49 +144,68 @@ set coverageDataDir := file("/tmp") ## Trouble-shooting failing tests -scoverage does a lot of file writing behind the scenes in order to track which -statements have been executed. If you are running into a scenario where your -tests normally pass, but fail when scoverage is enabled, then the culprit can be -one of the following: +scoverage does a lot of file writing behind the scenes in order to +track which statements have been executed. If you are running into a +scenario where your tests normally pass, but fail when scoverage is +enabled, then the culprit can be one of the following: -* timing issues on futures and other async operations, try upping the timeouts by an order of magnitude. -* tests are run in a sandbox mode (such as with `java.security.PrivilegedAction`), try running the tests outside of the sandbox. +* timing issues on futures and other async operations, try upping the + timeouts by an order of magnitude. +* tests are run in a sandbox mode (such as with + `java.security.PrivilegedAction`), try running the tests outside + of the sandbox. ## Example project -[the scoverage samples project](https://github.com/scoverage/sbt-scoverage-samples). +To see the plugin in action you can checkout the scoverage [samples][] +project. ## Integrations ### Codacy -[Codacy](https://www.codacy.com) integrates with your favorite coverage tool to -provide an in-depth overlook of your project status. scoverage information can -be integrated into Codacy through the -[codacy-coverage-reporter](https://github.com/codacy/codacy-coverage-reporter). +[Codacy][] integrates with your favorite coverage tool to provide an +in-depth overlook of your project status. scoverage information can be +integrated into Codacy through the [codacy-coverage-reporter][]. ### Coveralls -If you have an open source project then you can add code coverage metrics with -the [Coveralls](https://coveralls.io/). scoverage will integrate with coveralls -using the [sbt-coveralls](https://github.com/scoverage/sbt-coveralls) plugin. +If you have an open source project then you can publish the code +coverage metrics with [Coveralls][]. This plugin will integrate with +coveralls using the [sbt-coveralls][] plugin. ### Codecov -You can integrate with [Codecov](https://about.codecov.io/) easily sending your -reports there via your CI. You can see an example of this here in -[codecov/example-scala](https://github.com/codecov/example-scala). +You can also integrate with [Codecov][] by sending your reports there +via your CI. You can see an example in [codecov-example-scala][]. -### Plugin for SonarQube +### SonarQube -If you want to visually browse statement coverage reports then use this [plugin -for SonarQube](https://github.com/RadoBuransky/sonar-scoverage-plugin). It -allows you to review overall project statement coverage as well as dig deeper -into sub-modules, directories and source code files to see uncovered statements. -Statement coverage measurement can become an integral part of your team's -continuous integration process and a required quality standard. +If you want to visually browse coverage reports then you can use the +[SonarQube][] plugin. It allows you to review overall project +statement coverage as well as dig deeper into sub-modules, directories +and source code files to see uncovered statements. Statement coverage +measurement can become an integral part of your team's continuous +integration process and a required quality standard. ## Release Notes -For any information on releases and upgrading, please refer to the [release -page](https://github.com/scoverage/sbt-scoverage/releases). +For any information on releases and upgrading, please refer to the +[release][] page. + +[gitter]: https://gitter.im/scoverage/scoverage +[gitter-badge]: https://img.shields.io/gitter/room/scoverage/scoverage.svg +[maven]: https://search.maven.org/artifact/org.scoverage/sbt-scoverage +[maven-badge]: https://index.scala-lang.org/scoverage/sbt-scoverage/sbt-scoverage/latest.svg&label=maven-central +[license]: http://www.apache.org/licenses/LICENSE-2.0.txt +[license-badge]: http://img.shields.io/:license-Apache%202-red.svg +[scoverage]: https://github.com/scoverage/scalac-scoverage-plugin +[samples]: https://github.com/scoverage/sbt-scoverage-samples +[codacy-coverage-reporter]: https://github.com/codacy/codacy-coverage-reporter +[Codacy]: https://www.codacy.com +[Coveralls]: https://coveralls.io +[sbt-coveralls]: https://github.com/scoverage/sbt-coveralls +[Codecov]: https://about.codecov.io +[codecov-example-scala]: https://github.com/codecov/example-scala +[SonarQube]: https://github.com/RadoBuransky/sonar-scoverage-plugin +[release]: https://github.com/scoverage/sbt-scoverage/releases From a211ec53832f5cec1a3173aa35c3c85db72274d7 Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Tue, 23 Jul 2024 15:37:29 +0100 Subject: [PATCH 05/51] README: Fix maven badge. Use footnotes for links. Reformat/Refresh. --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 109dc5ef..7b04f1a6 100644 --- a/README.md +++ b/README.md @@ -193,19 +193,19 @@ integration process and a required quality standard. For any information on releases and upgrading, please refer to the [release][] page. -[gitter]: https://gitter.im/scoverage/scoverage -[gitter-badge]: https://img.shields.io/gitter/room/scoverage/scoverage.svg -[maven]: https://search.maven.org/artifact/org.scoverage/sbt-scoverage -[maven-badge]: https://index.scala-lang.org/scoverage/sbt-scoverage/sbt-scoverage/latest.svg&label=maven-central -[license]: http://www.apache.org/licenses/LICENSE-2.0.txt -[license-badge]: http://img.shields.io/:license-Apache%202-red.svg -[scoverage]: https://github.com/scoverage/scalac-scoverage-plugin -[samples]: https://github.com/scoverage/sbt-scoverage-samples -[codacy-coverage-reporter]: https://github.com/codacy/codacy-coverage-reporter [Codacy]: https://www.codacy.com -[Coveralls]: https://coveralls.io -[sbt-coveralls]: https://github.com/scoverage/sbt-coveralls [Codecov]: https://about.codecov.io -[codecov-example-scala]: https://github.com/codecov/example-scala +[Coveralls]: https://coveralls.io [SonarQube]: https://github.com/RadoBuransky/sonar-scoverage-plugin +[codacy-coverage-reporter]: https://github.com/codacy/codacy-coverage-reporter +[codecov-example-scala]: https://github.com/codecov/example-scala +[gitter-badge]: https://img.shields.io/gitter/room/scoverage/scoverage.svg +[gitter]: https://gitter.im/scoverage/scoverage +[license-badge]: http://img.shields.io/:license-Apache%202-red.svg +[license]: http://www.apache.org/licenses/LICENSE-2.0.txt +[maven-badge]: https://index.scala-lang.org/scoverage/sbt-scoverage/sbt-scoverage/latest.svg +[maven]: https://search.maven.org/artifact/org.scoverage/sbt-scoverage [release]: https://github.com/scoverage/sbt-scoverage/releases +[samples]: https://github.com/scoverage/sbt-scoverage-samples +[sbt-coveralls]: https://github.com/scoverage/sbt-coveralls +[scoverage]: https://github.com/scoverage/scalac-scoverage-plugin From e5c04feae6a23a32a34bb0c1838b8ce1685221ed Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Tue, 23 Jul 2024 15:34:02 +0100 Subject: [PATCH 06/51] README: Fix maven badge. Use footnotes for links. Reformat/Refresh. --- README.md | 143 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 25cd9c03..109dc5ef 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,20 @@ # sbt-scoverage -[![Gitter](https://img.shields.io/gitter/room/scoverage/scoverage.svg)](https://gitter.im/scoverage/scoverage) -[![Maven Central](https://img.shields.io/github/v/release/scoverage/sbt-scoverage?label=maven-central)](https://search.maven.org/artifact/org.scoverage/sbt-scoverage/) -[![License](http://img.shields.io/:license-Apache%202-red.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) +[![gitter-badge][]][gitter] +[![maven-badge][]][maven] +[![license-badge][]][license] -sbt-scoverage is an sbt plugin that offers support for Scala code coverage using -[scoverage](https://github.com/scoverage/scalac-scoverage-plugin). This plugin -supports Scala 2.12, 2.13, and 3. +sbt-scoverage is an sbt plugin that offers support for Scala code +coverage using [scoverage][]. This plugin supports Scala 2.12, 2.13, +and 3. -**NOTE**: that ScalaJS and Scala Native support is limited to Scala 2. -**NOTE**: that Scala 3 support starts with 3.2.x. +**NOTE**: ScalaJS and Scala Native support is limited to Scala 2. + +**NOTE**: Scala 3 support starts with 3.2.x. ## Setup -**Requirements**: Requires sbt 1.2.8 or above +**Requirements**: Requires sbt 1.2.8 or above. In `project/plugins.sbt`: ```scala @@ -46,40 +47,43 @@ To generate the coverage reports run sbt coverageReport ``` -Coverage reports will be in your `target/scala-/scoverage-report` -directory. There are HTML and XML reports. The XML is useful if you need to -programatically use the results, or if you're writing a tool. +Coverage reports will be in your +`target/scala-/scoverage-report` directory. There are +HTML and XML reports. The XML is useful if you need to programatically +use the results, or if you're writing a tool. -**NOTE**: If you're running the coverage reports from within an sbt console -session (as opposed to one command per sbt launch), then the `coverage` command -is sticky. To turn it back off when you're done running reports, use the -`coverageOff` command or reset `coverageEnabled` with `set coverageEnabled := -false`. +**NOTE**: If you're running the coverage reports from within an sbt +console session (as opposed to one command per sbt launch), then the +`coverage` command is sticky. To turn it back off when you're done +running reports, use the `coverageOff` command or reset +`coverageEnabled` with `set coverageEnabled := false`. ### Multi project reports -By default, scoverage will generate reports for each project separately. You can -merge them into an aggregated report by using the following: +By default, scoverage will generate reports for each project +separately. You can merge them into an aggregated report by using the +following: ``` $ sbt coverageAggregate ``` -**NOTE**: You do not need to run `coverageReport` before `coverageAggregate`; it -aggregates over the sub-projects' coverage data directly, not the report xml. +**NOTE**: You do not need to run `coverageReport` before +`coverageAggregate`; it aggregates over the sub-projects' coverage +data directly, not the report xml. ### Exclude classes and packages and files -You can exclude classes from being considered for coverage measurement by -providing semicolon-separated list of regular expressions. +You can exclude classes from being considered for coverage measurement +by providing semicolon-separated list of regular expressions. ```scala coverageExcludedPackages := ";Reverse.*;.*AuthService.*;models\\.data\\..*" ``` -The regular expressions are matched against the fully qualified class name, and -must match the entire string to take effect. Any matched classes will not be -instrumented or included in the coverage report. +The regular expressions are matched against the fully qualified class +name, and must match the entire string to take effect. Any matched +classes will not be instrumented or included in the coverage report. You can also exclude files and file paths. @@ -87,9 +91,10 @@ You can also exclude files and file paths. coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" ``` -Note: The `.scala` file extension needs to be omitted from the filename, if one is given. +**NOTE**: The `.scala` file extension needs to be omitted from the +filename, if one is given. -Note: These two options only work for Scala2 and Scala 3.4.2+. +**NOTE**: These two options only work for Scala2 and Scala 3.4.2+. You can also mark sections of code with comments like: @@ -102,7 +107,7 @@ You can also mark sections of code with comments like: Any code between two such comments will not be instrumented or included in the coverage report. -Note: Comments exclusion works only for Scala2. +**NOTE**: Comments exclusion works only for Scala2. ### Minimum coverage @@ -118,13 +123,14 @@ coverageMinimumStmtPerFile := 85 coverageMinimumBranchPerFile := 80 ``` -These settings will be enforced when the reports are generated. If you generate -an aggregate report using `coverageAggregate` then these settings will apply to -that report. +These settings will be enforced when the reports are generated. If +you generate an aggregate report using `coverageAggregate` then these +settings will apply to that report. ### Override Location for Coverage Data And Report -If desired, one could override the default location for generating the sbt report and data through setting `coverageDataDir`: +If desired, one could override the default location for generating the +sbt report and data through setting `coverageDataDir`: Example in data-dir test: ```scala @@ -138,49 +144,68 @@ set coverageDataDir := file("/tmp") ## Trouble-shooting failing tests -scoverage does a lot of file writing behind the scenes in order to track which -statements have been executed. If you are running into a scenario where your -tests normally pass, but fail when scoverage is enabled, then the culprit can be -one of the following: +scoverage does a lot of file writing behind the scenes in order to +track which statements have been executed. If you are running into a +scenario where your tests normally pass, but fail when scoverage is +enabled, then the culprit can be one of the following: -* timing issues on futures and other async operations, try upping the timeouts by an order of magnitude. -* tests are run in a sandbox mode (such as with `java.security.PrivilegedAction`), try running the tests outside of the sandbox. +* timing issues on futures and other async operations, try upping the + timeouts by an order of magnitude. +* tests are run in a sandbox mode (such as with + `java.security.PrivilegedAction`), try running the tests outside + of the sandbox. ## Example project -[the scoverage samples project](https://github.com/scoverage/sbt-scoverage-samples). +To see the plugin in action you can checkout the scoverage [samples][] +project. ## Integrations ### Codacy -[Codacy](https://www.codacy.com) integrates with your favorite coverage tool to -provide an in-depth overlook of your project status. scoverage information can -be integrated into Codacy through the -[codacy-coverage-reporter](https://github.com/codacy/codacy-coverage-reporter). +[Codacy][] integrates with your favorite coverage tool to provide an +in-depth overlook of your project status. scoverage information can be +integrated into Codacy through the [codacy-coverage-reporter][]. ### Coveralls -If you have an open source project then you can add code coverage metrics with -the [Coveralls](https://coveralls.io/). scoverage will integrate with coveralls -using the [sbt-coveralls](https://github.com/scoverage/sbt-coveralls) plugin. +If you have an open source project then you can publish the code +coverage metrics with [Coveralls][]. This plugin will integrate with +coveralls using the [sbt-coveralls][] plugin. ### Codecov -You can integrate with [Codecov](https://about.codecov.io/) easily sending your -reports there via your CI. You can see an example of this here in -[codecov/example-scala](https://github.com/codecov/example-scala). +You can also integrate with [Codecov][] by sending your reports there +via your CI. You can see an example in [codecov-example-scala][]. -### Plugin for SonarQube +### SonarQube -If you want to visually browse statement coverage reports then use this [plugin -for SonarQube](https://github.com/RadoBuransky/sonar-scoverage-plugin). It -allows you to review overall project statement coverage as well as dig deeper -into sub-modules, directories and source code files to see uncovered statements. -Statement coverage measurement can become an integral part of your team's -continuous integration process and a required quality standard. +If you want to visually browse coverage reports then you can use the +[SonarQube][] plugin. It allows you to review overall project +statement coverage as well as dig deeper into sub-modules, directories +and source code files to see uncovered statements. Statement coverage +measurement can become an integral part of your team's continuous +integration process and a required quality standard. ## Release Notes -For any information on releases and upgrading, please refer to the [release -page](https://github.com/scoverage/sbt-scoverage/releases). +For any information on releases and upgrading, please refer to the +[release][] page. + +[gitter]: https://gitter.im/scoverage/scoverage +[gitter-badge]: https://img.shields.io/gitter/room/scoverage/scoverage.svg +[maven]: https://search.maven.org/artifact/org.scoverage/sbt-scoverage +[maven-badge]: https://index.scala-lang.org/scoverage/sbt-scoverage/sbt-scoverage/latest.svg&label=maven-central +[license]: http://www.apache.org/licenses/LICENSE-2.0.txt +[license-badge]: http://img.shields.io/:license-Apache%202-red.svg +[scoverage]: https://github.com/scoverage/scalac-scoverage-plugin +[samples]: https://github.com/scoverage/sbt-scoverage-samples +[codacy-coverage-reporter]: https://github.com/codacy/codacy-coverage-reporter +[Codacy]: https://www.codacy.com +[Coveralls]: https://coveralls.io +[sbt-coveralls]: https://github.com/scoverage/sbt-coveralls +[Codecov]: https://about.codecov.io +[codecov-example-scala]: https://github.com/codecov/example-scala +[SonarQube]: https://github.com/RadoBuransky/sonar-scoverage-plugin +[release]: https://github.com/scoverage/sbt-scoverage/releases From 9a0b190b131f9008c441a637cea4623aa76fc5a1 Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Tue, 23 Jul 2024 15:37:29 +0100 Subject: [PATCH 07/51] README: Fix maven badge. Use footnotes for links. Reformat/Refresh. --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 109dc5ef..7b04f1a6 100644 --- a/README.md +++ b/README.md @@ -193,19 +193,19 @@ integration process and a required quality standard. For any information on releases and upgrading, please refer to the [release][] page. -[gitter]: https://gitter.im/scoverage/scoverage -[gitter-badge]: https://img.shields.io/gitter/room/scoverage/scoverage.svg -[maven]: https://search.maven.org/artifact/org.scoverage/sbt-scoverage -[maven-badge]: https://index.scala-lang.org/scoverage/sbt-scoverage/sbt-scoverage/latest.svg&label=maven-central -[license]: http://www.apache.org/licenses/LICENSE-2.0.txt -[license-badge]: http://img.shields.io/:license-Apache%202-red.svg -[scoverage]: https://github.com/scoverage/scalac-scoverage-plugin -[samples]: https://github.com/scoverage/sbt-scoverage-samples -[codacy-coverage-reporter]: https://github.com/codacy/codacy-coverage-reporter [Codacy]: https://www.codacy.com -[Coveralls]: https://coveralls.io -[sbt-coveralls]: https://github.com/scoverage/sbt-coveralls [Codecov]: https://about.codecov.io -[codecov-example-scala]: https://github.com/codecov/example-scala +[Coveralls]: https://coveralls.io [SonarQube]: https://github.com/RadoBuransky/sonar-scoverage-plugin +[codacy-coverage-reporter]: https://github.com/codacy/codacy-coverage-reporter +[codecov-example-scala]: https://github.com/codecov/example-scala +[gitter-badge]: https://img.shields.io/gitter/room/scoverage/scoverage.svg +[gitter]: https://gitter.im/scoverage/scoverage +[license-badge]: http://img.shields.io/:license-Apache%202-red.svg +[license]: http://www.apache.org/licenses/LICENSE-2.0.txt +[maven-badge]: https://index.scala-lang.org/scoverage/sbt-scoverage/sbt-scoverage/latest.svg +[maven]: https://search.maven.org/artifact/org.scoverage/sbt-scoverage [release]: https://github.com/scoverage/sbt-scoverage/releases +[samples]: https://github.com/scoverage/sbt-scoverage-samples +[sbt-coveralls]: https://github.com/scoverage/sbt-coveralls +[scoverage]: https://github.com/scoverage/scalac-scoverage-plugin From dc294cff5a86481e29d6a1712745f20835d89d19 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Jul 2024 02:52:18 +0000 Subject: [PATCH 08/51] Update scalafmt-core to 3.8.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 61c08776..cba3213f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.8.2" +version = "3.8.3" project.git = true runner.dialect = "scala213" From c3211b85a7548a30fc36e91b91f317483bdf381e Mon Sep 17 00:00:00 2001 From: Eugene Platonov Date: Thu, 8 Aug 2024 10:03:45 -0400 Subject: [PATCH 09/51] Properly handle multiple exclude entries for Scala 3 --- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 4 ++-- .../scoverage/scala3-coverage-excluded-files/build.sbt | 2 +- .../src/main/scala/three/GoodCoverage.scala | 9 +++++++++ .../scala3-coverage-excluded-packages/build.sbt | 2 +- .../src/main/scala/three/GoodCoverage.scala | 9 +++++++++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index feba91ba..c48d3d88 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -197,7 +197,7 @@ object ScoverageSbtPlugin extends AutoPlugin { if isScala3SupportingFilePackageExclusion( scalaVersion.value ) => - s"-coverage-exclude-classlikes:$v" + s"-coverage-exclude-classlikes:${v.replace(';', ',')}" }, excludedFiles .collect { @@ -205,7 +205,7 @@ object ScoverageSbtPlugin extends AutoPlugin { if isScala3SupportingFilePackageExclusion( scalaVersion.value ) => - s"-coverage-exclude-files:$v" + s"-coverage-exclude-files:${v.replace(';', ',')}" } ).flatten } else if (coverageEnabled.value && !isScala2(scalaVersion.value)) { diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt index fef0a139..1bf9ac1a 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt @@ -4,7 +4,7 @@ scalaVersion := "3.4.2" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test -coverageExcludedFiles := ".*/two/GoodCoverage" +coverageExcludedFiles := ".*/two/GoodCoverage;.*/three/GoodCoverage" resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala b/src/sbt-test/scoverage/scala3-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala new file mode 100644 index 00000000..260d15a4 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala @@ -0,0 +1,9 @@ +package three + +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt index 083a1e20..dfd5b302 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt @@ -4,7 +4,7 @@ scalaVersion := "3.4.2" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test -coverageExcludedPackages := "two\\..*" +coverageExcludedPackages := "two\\..*;three\\..*" resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala new file mode 100644 index 00000000..260d15a4 --- /dev/null +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala @@ -0,0 +1,9 @@ +package three + +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} From fca2698ba95d90bcdaa6d51c5f99ddf8f0fcf0e8 Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Wed, 21 Aug 2024 17:18:08 +0100 Subject: [PATCH 10/51] Fix the sonatypeRepo deprecated warning. --- src/sbt-test/scoverage/aggregate-disabled-module/build.sbt | 2 +- src/sbt-test/scoverage/aggregate-only/build.sbt | 2 +- src/sbt-test/scoverage/aggregate/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage/build.sbt | 2 +- src/sbt-test/scoverage/coverage-excluded-files/build.sbt | 4 ++-- src/sbt-test/scoverage/coverage-excluded-packages/build.sbt | 4 ++-- src/sbt-test/scoverage/coverage-off/build.sbt | 2 +- src/sbt-test/scoverage/data-dir/build.sbt | 2 +- src/sbt-test/scoverage/good-coverage/build.sbt | 2 +- src/sbt-test/scoverage/preserve-set/build.sbt | 2 +- src/sbt-test/scoverage/scala3-bad/build.sbt | 2 +- .../scoverage/scala3-coverage-excluded-files/build.sbt | 4 ++-- .../scoverage/scala3-coverage-excluded-packages/build.sbt | 2 +- src/sbt-test/scoverage/scala3-good/build.sbt | 2 +- src/sbt-test/scoverage/scalajs/build.sbt | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt index 45dfae25..fc741e47 100644 --- a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt +++ b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt @@ -12,6 +12,6 @@ lazy val c = project.disablePlugins(ScoverageSbtPlugin) ThisBuild / resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index e148019e..a312bb22 100644 --- a/src/sbt-test/scoverage/aggregate-only/build.sbt +++ b/src/sbt-test/scoverage/aggregate-only/build.sbt @@ -35,6 +35,6 @@ lazy val root = (project in file(".")) ThisBuild / resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt index e148019e..a312bb22 100644 --- a/src/sbt-test/scoverage/aggregate/build.sbt +++ b/src/sbt-test/scoverage/aggregate/build.sbt @@ -35,6 +35,6 @@ lazy val root = (project in file(".")) ThisBuild / resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } 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 49d93c86..3dc05bc6 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt @@ -14,6 +14,6 @@ resolvers ++= { .get("plugin.version") .map(_.endsWith("-SNAPSHOT")) .getOrElse(false) - ) Seq(Resolver.sonatypeRepo("snapshots")) + ) Resolver.sonatypeOssRepos("snapshots") else Seq.empty } 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 66e55557..76a86765 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt @@ -14,6 +14,6 @@ resolvers ++= { .get("plugin.version") .map(_.endsWith("-SNAPSHOT")) .getOrElse(false) - ) Seq(Resolver.sonatypeRepo("snapshots")) + ) Resolver.sonatypeOssRepos("snapshots") else Seq.empty } 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 aba950e6..de6ae33a 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt @@ -14,6 +14,6 @@ resolvers ++= { .get("plugin.version") .map(_.endsWith("-SNAPSHOT")) .getOrElse(false) - ) Seq(Resolver.sonatypeRepo("snapshots")) + ) Resolver.sonatypeOssRepos("snapshots") else Seq.empty } 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 8afb7d2c..1094fc13 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt @@ -14,6 +14,6 @@ resolvers ++= { .get("plugin.version") .map(_.endsWith("-SNAPSHOT")) .getOrElse(false) - ) Seq(Resolver.sonatypeRepo("snapshots")) + ) Resolver.sonatypeOssRepos("snapshots") else Seq.empty } 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 65588c14..2d59fe2c 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt @@ -14,6 +14,6 @@ resolvers ++= { .get("plugin.version") .map(_.endsWith("-SNAPSHOT")) .getOrElse(false) - ) Seq(Resolver.sonatypeRepo("snapshots")) + ) Resolver.sonatypeOssRepos("snapshots") else Seq.empty } 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 323acd62..96a6e724 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt @@ -14,6 +14,6 @@ resolvers ++= { .get("plugin.version") .map(_.endsWith("-SNAPSHOT")) .getOrElse(false) - ) Seq(Resolver.sonatypeRepo("snapshots")) + ) Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index 10f0b40b..15ab2ebc 100644 --- a/src/sbt-test/scoverage/bad-coverage/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage/build.sbt @@ -10,6 +10,6 @@ coverageFailOnMinimum := true resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt index 1f595f00..40df42bd 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt @@ -4,10 +4,10 @@ scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test -coverageExcludedFiles := ".*/two/GoodCoverage" +coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt index b87f3382..8a1df74d 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt @@ -4,10 +4,10 @@ scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test -coverageExcludedPackages := "two\\..*" +coverageExcludedPackages := "two\\..*;three\\..*" resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt index d7a52356..8c0581ba 100644 --- a/src/sbt-test/scoverage/coverage-off/build.sbt +++ b/src/sbt-test/scoverage/coverage-off/build.sbt @@ -15,6 +15,6 @@ coverageFailOnMinimum := true resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/data-dir/build.sbt b/src/sbt-test/scoverage/data-dir/build.sbt index 56753f62..87dc5e73 100644 --- a/src/sbt-test/scoverage/data-dir/build.sbt +++ b/src/sbt-test/scoverage/data-dir/build.sbt @@ -12,6 +12,6 @@ coverageFailOnMinimum := true resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt index d7a52356..8c0581ba 100644 --- a/src/sbt-test/scoverage/good-coverage/build.sbt +++ b/src/sbt-test/scoverage/good-coverage/build.sbt @@ -15,6 +15,6 @@ coverageFailOnMinimum := true resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt index eb97e244..30c2c3c1 100644 --- a/src/sbt-test/scoverage/preserve-set/build.sbt +++ b/src/sbt-test/scoverage/preserve-set/build.sbt @@ -34,7 +34,7 @@ checkScoverageEnabled := { resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/scala3-bad/build.sbt b/src/sbt-test/scoverage/scala3-bad/build.sbt index 1eebd0b6..14d9917f 100644 --- a/src/sbt-test/scoverage/scala3-bad/build.sbt +++ b/src/sbt-test/scoverage/scala3-bad/build.sbt @@ -12,6 +12,6 @@ coverageEnabled := true resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt index 1bf9ac1a..0fa54581 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt @@ -4,10 +4,10 @@ scalaVersion := "3.4.2" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test -coverageExcludedFiles := ".*/two/GoodCoverage;.*/three/GoodCoverage" +coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt index dfd5b302..7a43f4c0 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt @@ -8,6 +8,6 @@ coverageExcludedPackages := "two\\..*;three\\..*" resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/scala3-good/build.sbt b/src/sbt-test/scoverage/scala3-good/build.sbt index 11e62df8..cd033fc1 100644 --- a/src/sbt-test/scoverage/scala3-good/build.sbt +++ b/src/sbt-test/scoverage/scala3-good/build.sbt @@ -15,6 +15,6 @@ coverageFailOnMinimum := true resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt index c8af3188..f757ffb4 100644 --- a/src/sbt-test/scoverage/scalajs/build.sbt +++ b/src/sbt-test/scoverage/scalajs/build.sbt @@ -16,6 +16,6 @@ lazy val crossJVM = cross.jvm ThisBuild / resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) - Seq(Resolver.sonatypeRepo("snapshots")) + Resolver.sonatypeOssRepos("snapshots") else Seq.empty } From a059af353eb5a16f1e8ded35c6aa100c078662c0 Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Wed, 21 Aug 2024 17:19:08 +0100 Subject: [PATCH 11/51] Make tests more comprehensive. --- src/sbt-test/scoverage/coverage-excluded-files/test | 2 ++ src/sbt-test/scoverage/coverage-excluded-packages/test | 2 ++ src/sbt-test/scoverage/scala3-coverage-excluded-files/test | 4 +++- src/sbt-test/scoverage/scala3-coverage-excluded-packages/test | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/sbt-test/scoverage/coverage-excluded-files/test b/src/sbt-test/scoverage/coverage-excluded-files/test index 7822d7ab..73b1427d 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/test +++ b/src/sbt-test/scoverage/coverage-excluded-files/test @@ -4,4 +4,6 @@ > test > coverageReport # There should be no directory for the excluded files +$ exists target/scala-2.13/scoverage-report/GoodCoverage.scala.html -$ exists target/scala-2.13/scoverage-report/two +-$ exists target/scala-2.13/scoverage-report/three diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/test b/src/sbt-test/scoverage/coverage-excluded-packages/test index 72f81f6c..6e9c114f 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/test +++ b/src/sbt-test/scoverage/coverage-excluded-packages/test @@ -4,4 +4,6 @@ > test > coverageReport # There should be no directory for the excluded package +$ exists target/scala-2.13/scoverage-report/GoodCoverage.scala.html -$ exists target/scala-2.13/scoverage-report/two +-$ exists target/scala-2.13/scoverage-report/three diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test index 08688334..6b515726 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test @@ -4,4 +4,6 @@ > test > coverageReport # There should be no directory for the excluded files --$ exists target/scala-3.4.2/scoverage-report/two \ No newline at end of file +$ exists target/scala-3.4.2/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.4.2/scoverage-report/two +-$ exists target/scala-3.4.2/scoverage-report/three diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test index e611b048..13dcccc4 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test @@ -4,4 +4,6 @@ > test > coverageReport # There should be no directory for the excluded package +$ exists target/scala-3.4.2/scoverage-report/GoodCoverage.scala.html -$ exists target/scala-3.4.2/scoverage-report/two +-$ exists target/scala-3.4.2/scoverage-report/three From cda912d0bb9b7f4731fb240cbd282947b2dc96fd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 21 Aug 2024 20:37:07 +0000 Subject: [PATCH 12/51] Update sbt-ci-release to 1.6.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0edb7d60..a382bd03 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.5.12") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From 7d71be99423bc5f9fbcd0ca0b47057b9b08e1294 Mon Sep 17 00:00:00 2001 From: Eugene Platonov Date: Sun, 25 Aug 2024 16:26:24 -0400 Subject: [PATCH 13/51] Support file and package exclusions for Scala 3.X.Y for Y < 2 --- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 6 ++++-- .../scoverage/scala3-coverage-excluded-packages/build.sbt | 2 +- .../scoverage/scala3-coverage-excluded-packages/test | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index c48d3d88..4e3662de 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -93,8 +93,10 @@ object ScoverageSbtPlugin extends AutoPlugin { CrossVersion .partialVersion(scalaVersion) .exists { - case (3, minor) if minor >= 4 && patch.exists(_ >= "2") => true - case _ => false + case (3, minor) + if minor > 4 || (minor == 4 && patch.exists(_ >= "2")) => + true + case _ => false } } diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt index 7a43f4c0..0c724f1a 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "3.4.2" +scalaVersion := "3.5.0" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test index 13dcccc4..f079e48e 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test @@ -4,6 +4,6 @@ > test > coverageReport # There should be no directory for the excluded package -$ exists target/scala-3.4.2/scoverage-report/GoodCoverage.scala.html --$ exists target/scala-3.4.2/scoverage-report/two --$ exists target/scala-3.4.2/scoverage-report/three +$ exists target/scala-3.5.0/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.5.0/scoverage-report/two +-$ exists target/scala-3.5.0/scoverage-report/three From 4c88573549e47b8ccbd83b42dc6535cc748e6863 Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Mon, 2 Sep 2024 19:25:00 +0100 Subject: [PATCH 14/51] Make the patch version work for 10 >= 2. --- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index 4e3662de..96074eaa 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -89,14 +89,13 @@ object ScoverageSbtPlugin extends AutoPlugin { } private def isScala3SupportingFilePackageExclusion(scalaVersion: String) = { - def patch = scalaVersion.split('.').drop(2).headOption + def patch = scalaVersion.split('.').map(_.toInt).drop(2).headOption CrossVersion .partialVersion(scalaVersion) .exists { - case (3, minor) - if minor > 4 || (minor == 4 && patch.exists(_ >= "2")) => - true - case _ => false + case (3, minor) if minor > 4 => true + case (3, minor) if (minor == 4 && patch.exists(_ >= 2)) => true + case _ => false } } From 76474405af6149e902d80d3f47d23a8141e2479b Mon Sep 17 00:00:00 2001 From: Roland Tritsch Date: Mon, 2 Sep 2024 19:26:01 +0100 Subject: [PATCH 15/51] Upgrade the excludeFilePackages test to 3.5.0. --- .../scoverage/scala3-coverage-excluded-files/build.sbt | 2 +- src/sbt-test/scoverage/scala3-coverage-excluded-files/test | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt index 0fa54581..ebcc4f7b 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "3.4.2" +scalaVersion := "3.5.0" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test index 6b515726..33ed081f 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test @@ -4,6 +4,6 @@ > test > coverageReport # There should be no directory for the excluded files -$ exists target/scala-3.4.2/scoverage-report/GoodCoverage.scala.html --$ exists target/scala-3.4.2/scoverage-report/two --$ exists target/scala-3.4.2/scoverage-report/three +$ exists target/scala-3.5.0/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.5.0/scoverage-report/two +-$ exists target/scala-3.5.0/scoverage-report/three From 63aba5e46f1d4f7147163e3c18ca92f5a84ffe67 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Thu, 5 Sep 2024 14:08:52 +0200 Subject: [PATCH 16/51] chore: update base scalac-scoverage version --- build.sbt | 2 +- src/sbt-test/scoverage/aggregate-disabled-module/build.sbt | 4 ++-- src/sbt-test/scoverage/aggregate-only/build.sbt | 4 ++-- src/sbt-test/scoverage/aggregate/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt | 4 ++-- .../scoverage/bad-coverage-package-branch/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage/build.sbt | 4 ++-- src/sbt-test/scoverage/coverage-excluded-files/build.sbt | 2 +- src/sbt-test/scoverage/coverage-excluded-packages/build.sbt | 4 ++-- src/sbt-test/scoverage/coverage-off/build.sbt | 4 ++-- src/sbt-test/scoverage/good-coverage/build.sbt | 4 ++-- src/sbt-test/scoverage/preserve-set/build.sbt | 6 +++--- src/sbt-test/scoverage/preserve-set/test | 4 ++-- .../scoverage/scala3-coverage-excluded-files/build.sbt | 2 +- .../scoverage/scala3-coverage-excluded-packages/build.sbt | 2 +- src/sbt-test/scoverage/scala3-good/build.sbt | 4 ++-- src/sbt-test/scoverage/scalajs/build.sbt | 4 ++-- 21 files changed, 38 insertions(+), 38 deletions(-) diff --git a/build.sbt b/build.sbt index eb9695ff..a4fad663 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "sbt-scoverage" import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts -lazy val scoverageVersion = "2.1.1" +lazy val scoverageVersion = "2.2.0" inThisBuild( List( diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt index fc741e47..45912ce4 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.13", - libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test + scalaVersion := "2.13.14", + libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test ) ) diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index a312bb22..b07d49d9 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.13" + scalaVersion := "2.13.14" ) def module(name: String) = { @@ -15,7 +15,7 @@ def module(name: String) = { .settings(commonSettings: _*) .settings( Keys.name := name, - libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test + libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test ) } diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt index a312bb22..ff077f58 100644 --- a/src/sbt-test/scoverage/aggregate/build.sbt +++ b/src/sbt-test/scoverage/aggregate/build.sbt @@ -15,7 +15,7 @@ def module(name: String) = { .settings(commonSettings: _*) .settings( Keys.name := name, - libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test + libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 3dc05bc6..1745724a 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 76a86765..4d13f78e 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 de6ae33a..f4b53cfd 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 1094fc13..814cd4f6 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 2d59fe2c..5d76fbe2 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 96a6e724..925ee0cd 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test coverageMinimumStmtTotal := 80 diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index 15ab2ebc..dcb4f549 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test coverageMinimumStmtTotal := 80 diff --git a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt index 40df42bd..1fcb1652 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.13" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt index 8a1df74d..7a5a9931 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 8c0581ba..cc06d1a7 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 8c0581ba..cc06d1a7 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.13" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 30c2c3c1..bf319770 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.13" +scalaVersion := "2.13.14" -crossScalaVersions := Seq("2.13.13") +crossScalaVersions := Seq("2.13.14") -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % 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 f66c1976..daf86f68 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.13" +> checkScalaVersion "2.13.14" > checkScoverageEnabled "false" > coverage > checkScoverageEnabled "true" > coverageOff -> checkScalaVersion "2.13.13" +> checkScalaVersion "2.13.14" > checkScoverageEnabled "false" diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt index ebcc4f7b..9f4c05ec 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "3.5.0" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt index 0c724f1a..47b8729c 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "3.5.0" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test coverageExcludedPackages := "two\\..*;three\\..*" diff --git a/src/sbt-test/scoverage/scala3-good/build.sbt b/src/sbt-test/scoverage/scala3-good/build.sbt index cd033fc1..a6d7d68f 100644 --- a/src/sbt-test/scoverage/scala3-good/build.sbt +++ b/src/sbt-test/scoverage/scala3-good/build.sbt @@ -1,8 +1,8 @@ version := "0.1" -scalaVersion := "3.2.0-RC1" +scalaVersion := "3.5.0" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test coverageMinimumStmtTotal := 100 coverageMinimumBranchTotal := 100 diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt index f757ffb4..d23155ea 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.10", - libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test + scalaVersion := "2.13.14", + libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test ) lazy val crossJS = cross.js From f2afa948974302c72e576a1b425616cebe9f714e Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Wed, 25 Sep 2024 09:47:26 +0200 Subject: [PATCH 17/51] chore: bump default scoverage version to support 2.13.15 --- build.sbt | 2 +- src/sbt-test/scoverage/aggregate-disabled-module/build.sbt | 2 +- src/sbt-test/scoverage/aggregate-only/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage/build.sbt | 2 +- src/sbt-test/scoverage/coverage-excluded-packages/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 | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.sbt b/build.sbt index a4fad663..42d1f78e 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "sbt-scoverage" import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts -lazy val scoverageVersion = "2.2.0" +lazy val scoverageVersion = "2.2.1" inThisBuild( List( diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt index 45912ce4..102747d4 100644 --- a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt +++ b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt @@ -1,7 +1,7 @@ inThisBuild( List( organization := "org.scoverage", - scalaVersion := "2.13.14", + scalaVersion := "2.13.15", libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test ) ) diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index b07d49d9..ba5b2b66 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.14" + scalaVersion := "2.13.15" ) def module(name: String) = { 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 1745724a..9bddee58 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test 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 4d13f78e..5e51409f 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test 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 f4b53cfd..63014f5e 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test 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 814cd4f6..1686a4cd 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test 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 5d76fbe2..791aa3d2 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test 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 925ee0cd..11a8bf05 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index dcb4f549..66488319 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.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt index 7a5a9931..570c2dad 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt index cc06d1a7..29c7f973 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.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt index cc06d1a7..29c7f973 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.13.14" +scalaVersion := "2.13.15" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt index bf319770..ca678e70 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.13.14" +scalaVersion := "2.13.15" -crossScalaVersions := Seq("2.13.14") +crossScalaVersions := Seq("2.13.15") libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/preserve-set/test b/src/sbt-test/scoverage/preserve-set/test index daf86f68..e30f7afd 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.14" +> checkScalaVersion "2.13.15" > checkScoverageEnabled "false" > coverage > checkScoverageEnabled "true" > coverageOff -> checkScalaVersion "2.13.14" +> checkScalaVersion "2.13.15" > checkScoverageEnabled "false" diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt index d23155ea..284d6494 100644 --- a/src/sbt-test/scoverage/scalajs/build.sbt +++ b/src/sbt-test/scoverage/scalajs/build.sbt @@ -7,7 +7,7 @@ lazy val cross = CrossProject("sjstest", file("sjstest"))(JVMPlatform, JSPlatform) .crossType(CrossType.Full) .settings( - scalaVersion := "2.13.14", + scalaVersion := "2.13.15", libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test ) From 914abe3bbf841b15f10f98d458e26cf0357f990e Mon Sep 17 00:00:00 2001 From: Antonio Morales Date: Tue, 1 Oct 2024 09:24:13 -0700 Subject: [PATCH 18/51] add Scala 3.3.4 to check for support around excluded packages and files support --- README.md | 2 +- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b04f1a6..61856278 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" **NOTE**: The `.scala` file extension needs to be omitted from the filename, if one is given. -**NOTE**: These two options only work for Scala2 and Scala 3.4.2+. +**NOTE**: These two options only work for Scala2, Scala 3.3.4+ and Scala 3.4.2+. You can also mark sections of code with comments like: diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index 96074eaa..ba7f5e32 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -95,6 +95,7 @@ object ScoverageSbtPlugin extends AutoPlugin { .exists { case (3, minor) if minor > 4 => true case (3, minor) if (minor == 4 && patch.exists(_ >= 2)) => true + case (3, minor) if (minor == 3 && patch.exists(_ >= 4)) => true case _ => false } } From 9e766d2a45397fe187e31c1736c3fed5de865715 Mon Sep 17 00:00:00 2001 From: Antonio Morales Date: Tue, 1 Oct 2024 09:29:15 -0700 Subject: [PATCH 19/51] update scala version for excluded files and packages to lowest supported version (3.3.4) --- src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt | 2 +- .../scoverage/scala3-coverage-excluded-packages/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt index 9f4c05ec..a6ecdab4 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "3.5.0" +scalaVersion := "3.3.4" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt index 47b8729c..429b97c4 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "3.5.0" +scalaVersion := "3.3.4" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test From d750c1edb1d248ffa5bf488b7ff7b9bf634e5323 Mon Sep 17 00:00:00 2001 From: Antonio Morales Date: Tue, 1 Oct 2024 09:33:11 -0700 Subject: [PATCH 20/51] update test file assertions --- src/sbt-test/scoverage/scala3-coverage-excluded-files/test | 6 +++--- .../scoverage/scala3-coverage-excluded-packages/test | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test index 33ed081f..ce85327e 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test @@ -4,6 +4,6 @@ > test > coverageReport # There should be no directory for the excluded files -$ exists target/scala-3.5.0/scoverage-report/GoodCoverage.scala.html --$ exists target/scala-3.5.0/scoverage-report/two --$ exists target/scala-3.5.0/scoverage-report/three +$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.3.4/scoverage-report/two +-$ exists target/scala-3.3.4/scoverage-report/three diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test index f079e48e..a7dd274e 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test @@ -4,6 +4,6 @@ > test > coverageReport # There should be no directory for the excluded package -$ exists target/scala-3.5.0/scoverage-report/GoodCoverage.scala.html --$ exists target/scala-3.5.0/scoverage-report/two --$ exists target/scala-3.5.0/scoverage-report/three +$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.3.4/scoverage-report/two +-$ exists target/scala-3.3.4/scoverage-report/three From 1c79840f8a638ba1e52862c933f632064f5bd16c Mon Sep 17 00:00:00 2001 From: Antonio Morales Date: Tue, 1 Oct 2024 16:53:44 -0700 Subject: [PATCH 21/51] revert changes to scala 3.5.0 tests --- .../scoverage/scala3-coverage-excluded-files/build.sbt | 2 +- src/sbt-test/scoverage/scala3-coverage-excluded-files/test | 6 +++--- .../scoverage/scala3-coverage-excluded-packages/build.sbt | 2 +- .../scoverage/scala3-coverage-excluded-packages/test | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt index a6ecdab4..9f4c05ec 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "3.3.4" +scalaVersion := "3.5.0" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test index ce85327e..33ed081f 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test @@ -4,6 +4,6 @@ > test > coverageReport # There should be no directory for the excluded files -$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html --$ exists target/scala-3.3.4/scoverage-report/two --$ exists target/scala-3.3.4/scoverage-report/three +$ exists target/scala-3.5.0/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.5.0/scoverage-report/two +-$ exists target/scala-3.5.0/scoverage-report/three diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt index 429b97c4..47b8729c 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "3.3.4" +scalaVersion := "3.5.0" libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test index a7dd274e..f079e48e 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test @@ -4,6 +4,6 @@ > test > coverageReport # There should be no directory for the excluded package -$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html --$ exists target/scala-3.3.4/scoverage-report/two --$ exists target/scala-3.3.4/scoverage-report/three +$ exists target/scala-3.5.0/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.5.0/scoverage-report/two +-$ exists target/scala-3.5.0/scoverage-report/three From 67f51576283e04ffe16b8d91b9b048c832202aa0 Mon Sep 17 00:00:00 2001 From: Antonio Morales Date: Tue, 1 Oct 2024 16:56:11 -0700 Subject: [PATCH 22/51] Duplicate scala3 coverage excluded tests for scala 3.3.4 --- .../build.sbt | 13 +++++++++++++ .../src/main/scala/GoodCoverage.scala | 7 +++++++ .../src/main/scala/three/GoodCoverage.scala | 9 +++++++++ .../src/main/scala/two/GoodCoverage.scala | 9 +++++++++ .../src/test/scala/GoodCoverageSpec.scala | 19 +++++++++++++++++++ .../scala3.3.4-coverage-excluded-files/test | 9 +++++++++ .../build.sbt | 13 +++++++++++++ .../src/main/scala/GoodCoverage.scala | 7 +++++++ .../src/main/scala/three/GoodCoverage.scala | 9 +++++++++ .../src/main/scala/two/GoodCoverage.scala | 9 +++++++++ .../src/test/scala/GoodCoverageSpec.scala | 19 +++++++++++++++++++ .../test | 9 +++++++++ 12 files changed, 132 insertions(+) create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/build.sbt create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/two/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/test/scala/GoodCoverageSpec.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/test create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/build.sbt create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/test diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/build.sbt new file mode 100644 index 00000000..a6ecdab4 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/build.sbt @@ -0,0 +1,13 @@ +version := "0.1" + +scalaVersion := "3.3.4" + +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test + +coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*" + +resolvers ++= { + if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) + Resolver.sonatypeOssRepos("snapshots") + else Seq.empty +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/GoodCoverage.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/GoodCoverage.scala new file mode 100644 index 00000000..ac6582bb --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/GoodCoverage.scala @@ -0,0 +1,7 @@ +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala new file mode 100644 index 00000000..260d15a4 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala @@ -0,0 +1,9 @@ +package three + +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/two/GoodCoverage.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/two/GoodCoverage.scala new file mode 100644 index 00000000..587e11e1 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/main/scala/two/GoodCoverage.scala @@ -0,0 +1,9 @@ +package two + +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/test/scala/GoodCoverageSpec.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/test/scala/GoodCoverageSpec.scala new file mode 100644 index 00000000..44eec1c9 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/src/test/scala/GoodCoverageSpec.scala @@ -0,0 +1,19 @@ +import munit.FunSuite + +/** Created by tbarke001c on 7/8/14. + */ +class GoodCoverageSpec extends FunSuite { + + test("GoodCoverage should sum two numbers") { + assertEquals(GoodCoverage.sum(1, 2), 3) + assertEquals(GoodCoverage.sum(0, 3), 3) + assertEquals(GoodCoverage.sum(3, 0), 3) + } + + test("two.GoodCoverage should sum two numbers") { + assertEquals(two.GoodCoverage.sum(1, 2), 3) + assertEquals(two.GoodCoverage.sum(0, 3), 3) + assertEquals(two.GoodCoverage.sum(3, 0), 3) + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/test new file mode 100644 index 00000000..ce85327e --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/test @@ -0,0 +1,9 @@ +# run scoverage using the coverage task +> clean +> coverage +> test +> coverageReport +# There should be no directory for the excluded files +$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.3.4/scoverage-report/two +-$ exists target/scala-3.3.4/scoverage-report/three diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/build.sbt new file mode 100644 index 00000000..429b97c4 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/build.sbt @@ -0,0 +1,13 @@ +version := "0.1" + +scalaVersion := "3.3.4" + +libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test + +coverageExcludedPackages := "two\\..*;three\\..*" + +resolvers ++= { + if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) + Resolver.sonatypeOssRepos("snapshots") + else Seq.empty +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/GoodCoverage.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/GoodCoverage.scala new file mode 100644 index 00000000..ac6582bb --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/GoodCoverage.scala @@ -0,0 +1,7 @@ +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala new file mode 100644 index 00000000..260d15a4 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala @@ -0,0 +1,9 @@ +package three + +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala new file mode 100644 index 00000000..587e11e1 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/main/scala/two/GoodCoverage.scala @@ -0,0 +1,9 @@ +package two + +object GoodCoverage { + + def sum(num1: Int, num2: Int) = { + if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala new file mode 100644 index 00000000..44eec1c9 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/src/test/scala/GoodCoverageSpec.scala @@ -0,0 +1,19 @@ +import munit.FunSuite + +/** Created by tbarke001c on 7/8/14. + */ +class GoodCoverageSpec extends FunSuite { + + test("GoodCoverage should sum two numbers") { + assertEquals(GoodCoverage.sum(1, 2), 3) + assertEquals(GoodCoverage.sum(0, 3), 3) + assertEquals(GoodCoverage.sum(3, 0), 3) + } + + test("two.GoodCoverage should sum two numbers") { + assertEquals(two.GoodCoverage.sum(1, 2), 3) + assertEquals(two.GoodCoverage.sum(0, 3), 3) + assertEquals(two.GoodCoverage.sum(3, 0), 3) + } + +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/test new file mode 100644 index 00000000..a7dd274e --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/test @@ -0,0 +1,9 @@ +# run scoverage using the coverage task +> clean +> coverage +> test +> coverageReport +# There should be no directory for the excluded package +$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html +-$ exists target/scala-3.3.4/scoverage-report/two +-$ exists target/scala-3.3.4/scoverage-report/three From 383f4901ccd8888cf21a3e7d9a70503c32841d3c Mon Sep 17 00:00:00 2001 From: Antonio Morales Date: Mon, 7 Oct 2024 14:20:19 -0700 Subject: [PATCH 23/51] include missing project/ directory for scala 3.3.4 tests --- .../project/build.properties | 1 + .../project/plugins.sbt | 16 ++++++++++++++++ .../project/build.properties | 1 + .../project/plugins.sbt | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/build.properties create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/plugins.sbt create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/build.properties create mode 100644 src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/plugins.sbt diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/build.properties b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/build.properties new file mode 100644 index 00000000..04267b14 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/plugins.sbt b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/plugins.sbt new file mode 100644 index 00000000..8d349239 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/plugins.sbt @@ -0,0 +1,16 @@ +val pluginVersion = sys.props.getOrElse( + "plugin.version", + throw new RuntimeException( + """|The system property 'plugin.version' is not defined. + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) + +addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) + +resolvers ++= { + if (pluginVersion.endsWith("-SNAPSHOT")) + Seq(Resolver.sonatypeRepo("snapshots")) + else + Seq.empty +} diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/build.properties b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/build.properties new file mode 100644 index 00000000..04267b14 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/plugins.sbt b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/plugins.sbt new file mode 100644 index 00000000..8d349239 --- /dev/null +++ b/src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/plugins.sbt @@ -0,0 +1,16 @@ +val pluginVersion = sys.props.getOrElse( + "plugin.version", + throw new RuntimeException( + """|The system property 'plugin.version' is not defined. + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) + +addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) + +resolvers ++= { + if (pluginVersion.endsWith("-SNAPSHOT")) + Seq(Resolver.sonatypeRepo("snapshots")) + else + Seq.empty +} From 812e5794444f1f84577cc3d232726e2e96eba8da Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 8 Oct 2024 21:27:26 +0000 Subject: [PATCH 24/51] Update sbt-ci-release to 1.7.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a382bd03..7a8fb8c3 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.6.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.7.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From c53e3d2249020389d3b7dbabfa1abdd4091387ab Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 14 Oct 2024 18:57:30 +0900 Subject: [PATCH 25/51] add sbt/setup-sbt --- .github/workflows/ci.yml | 4 ++++ .github/workflows/release.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 775f031b..1896b076 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,8 @@ jobs: with: fetch-depth: 0 + - uses: sbt/setup-sbt@v1 + - name: Set up JVM uses: actions/setup-java@v4 with: @@ -47,5 +49,7 @@ jobs: distribution: 'temurin' java-version: '11' + - uses: sbt/setup-sbt@v1 + - name: Check Formatting run: sbt scalafmtCheckAll diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa8cdd0a..6997694f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,7 @@ jobs: with: distribution: 'temurin' java-version: '11' + - uses: sbt/setup-sbt@v1 - run: sbt ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} From 2c1ecd7d3b6c0f7ebccd24121f30db096f37028d Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Mon, 14 Oct 2024 07:28:56 +0900 Subject: [PATCH 26/51] fix deprecated procedure syntax --- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index ba7f5e32..3fb50486 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -397,7 +397,7 @@ object ScoverageSbtPlugin extends AutoPlugin { reportDir: File, crossTarget: File, log: Logger - ) { + ): Unit = { def statsKeyValue(key: String, value: Int): String = s"##teamcity[buildStatisticValue key='$key' value='$value']" From 7a4d8c6119dd507496e4f92ccb229c6a9417c4fc Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Mon, 14 Oct 2024 07:39:18 +0900 Subject: [PATCH 27/51] remove unnecessary dependency --- build.sbt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 42d1f78e..e61d8375 100644 --- a/build.sbt +++ b/build.sbt @@ -33,10 +33,7 @@ lazy val root = Project("sbt-scoverage", file(".")) .enablePlugins(SbtPlugin, BuildInfoPlugin) .settings( libraryDependencies ++= Seq( - "org.scoverage" %% "scalac-scoverage-plugin" % scoverageVersion cross (CrossVersion.full), - "org.scoverage" %% "scalac-scoverage-reporter" % scoverageVersion, - "org.scoverage" %% "scalac-scoverage-domain" % scoverageVersion, - "org.scoverage" %% "scalac-scoverage-serializer" % scoverageVersion + "org.scoverage" %% "scalac-scoverage-reporter" % scoverageVersion ), buildInfoKeys := Seq[BuildInfoKey]("scoverageVersion" -> scoverageVersion), buildInfoPackage := "scoverage", From 80e6f8ea3a7640f88d97ef2bba6c255f38476c23 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Mon, 14 Oct 2024 19:44:34 +0900 Subject: [PATCH 28/51] run scalafmtSbtCheck in CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1896b076..cd01e9f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,4 +52,4 @@ jobs: - uses: sbt/setup-sbt@v1 - name: Check Formatting - run: sbt scalafmtCheckAll + run: sbt scalafmtSbtCheck scalafmtCheckAll From 7bda012d978794edef8d2c338b3eacba3da85e97 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 14 Oct 2024 21:42:35 +0000 Subject: [PATCH 29/51] Update sbt-ci-release to 1.8.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7a8fb8c3..00d345f6 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.7.0") +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") From 486b7598186d2d0a5187cda74c4173e7ac841754 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 22 Oct 2024 22:58:30 +0000 Subject: [PATCH 30/51] Update sbt-ci-release to 1.9.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 00d345f6..39a0a451 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.github.sbt" % "sbt-ci-release" % "1.9.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From 3b4fee9a2175b91848c248ddd88c77f717d249f9 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 14 Oct 2024 07:29:59 +0900 Subject: [PATCH 31/51] add sbt 2.x cross build setting --- .github/workflows/ci.yml | 4 ++-- build.sbt | 10 ++++++++++ project/build.properties | 2 +- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 8 ++++---- 4 files changed, 17 insertions(+), 7 deletions(-) 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/build.sbt b/build.sbt index e61d8375..0235b1d6 100644 --- a/build.sbt +++ b/build.sbt @@ -32,15 +32,25 @@ inThisBuild( lazy val root = Project("sbt-scoverage", file(".")) .enablePlugins(SbtPlugin, BuildInfoPlugin) .settings( + crossScalaVersions += "3.3.3", libraryDependencies ++= Seq( "org.scoverage" %% "scalac-scoverage-reporter" % scoverageVersion ), + pluginCrossBuild / sbtVersion := { + scalaBinaryVersion.value match { + case "2.12" => + (pluginCrossBuild / sbtVersion).value + case _ => + "2.0.0-M2" + } + }, 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..bc739060 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.3 diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index 3fb50486..2a2cf467 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) @@ -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 From caf8b7f68645f9c726fc2807d20d8c413db89a03 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 9 Nov 2024 22:08:17 +0000 Subject: [PATCH 32/51] Update sbt-buildinfo to 0.13.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 39a0a451..8646dc30 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.9.0") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From 4331ed2884fb9e16ab6fc1041b2d7382ef18f584 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Nov 2024 02:09:51 +0000 Subject: [PATCH 33/51] Update sbt, scripted-plugin to 1.10.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index bc739060..db1723b0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.3 +sbt.version=1.10.5 From c3792637129e681b716ab16210a9e5560b788992 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 2 Dec 2024 01:37:02 +0000 Subject: [PATCH 34/51] Update sbt, scripted-plugin to 1.10.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index db1723b0..e88a0d81 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 +sbt.version=1.10.6 From 49e1a54530d1bfb0c33100c18d14ed2fe1872f00 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 19 Dec 2024 17:47:25 +0000 Subject: [PATCH 35/51] Update sbt-ci-release to 1.9.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8646dc30..467eca72 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.9.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From c26baa48d713ff57ea37e6ea8e5fd453a39ec535 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Dec 2024 22:33:42 +0000 Subject: [PATCH 36/51] Update sbt, scripted-plugin to 1.10.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e88a0d81..73df629a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.6 +sbt.version=1.10.7 From b43680a73e0b5203b8187ee74cbb33c3f8c115d4 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Sat, 21 Dec 2024 10:25:04 +0900 Subject: [PATCH 37/51] sbt 2.0.0-M3 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0235b1d6..8d1127e0 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ inThisBuild( lazy val root = Project("sbt-scoverage", file(".")) .enablePlugins(SbtPlugin, BuildInfoPlugin) .settings( - crossScalaVersions += "3.3.3", + crossScalaVersions += "3.6.2", libraryDependencies ++= Seq( "org.scoverage" %% "scalac-scoverage-reporter" % scoverageVersion ), @@ -41,7 +41,7 @@ lazy val root = Project("sbt-scoverage", file(".")) case "2.12" => (pluginCrossBuild / sbtVersion).value case _ => - "2.0.0-M2" + "2.0.0-M3" } }, buildInfoKeys := Seq[BuildInfoKey]("scoverageVersion" -> scoverageVersion), From 85732d74a8736b53295c2409428f327d93e0c5b2 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Mon, 13 Jan 2025 21:09:18 +0100 Subject: [PATCH 38/51] chore: bump default scoverage to 2.3.0 --- build.sbt | 2 +- src/sbt-test/scoverage/aggregate-disabled-module/build.sbt | 4 ++-- src/sbt-test/scoverage/aggregate-only/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt | 4 ++-- .../scoverage/bad-coverage-package-branch/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt | 4 ++-- src/sbt-test/scoverage/bad-coverage/build.sbt | 4 ++-- src/sbt-test/scoverage/coverage-excluded-packages/build.sbt | 4 ++-- src/sbt-test/scoverage/coverage-off/build.sbt | 4 ++-- src/sbt-test/scoverage/good-coverage/build.sbt | 4 ++-- src/sbt-test/scoverage/preserve-set/build.sbt | 6 +++--- src/sbt-test/scoverage/preserve-set/test | 4 ++-- src/sbt-test/scoverage/scalajs/build.sbt | 4 ++-- src/sbt-test/scoverage/scalajs/project/plugins.sbt | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build.sbt b/build.sbt index 8d1127e0..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( 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") From dc82d430b15e7c2dc7ac595bba2d429e708072f6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 09:13:17 +0000 Subject: [PATCH 39/51] Update scalafmt-core to 3.8.5 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index cba3213f..c1e9b61f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.8.3" +version = "3.8.5" project.git = true runner.dialect = "scala213" From aa9b9a2fb96a17085e96f748ab78bcf98e4da033 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 09:13:11 +0000 Subject: [PATCH 40/51] Update sbt-scalafmt to 2.5.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 467eca72..5df90542 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.9.2") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") From cec59bacf6fb6160988252a3ec4b542810c47f8a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 25 Jan 2025 04:54:50 +0000 Subject: [PATCH 41/51] Update scalafmt-core to 3.8.6 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c1e9b61f..a3e40488 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.8.5" +version = "3.8.6" project.git = true runner.dialect = "scala213" From 445e87fe4592945407e7eaf1462b8e75487b5f20 Mon Sep 17 00:00:00 2001 From: Alexey Venderov Date: Tue, 18 Feb 2025 09:33:51 +0100 Subject: [PATCH 42/51] Ensure the data dir uses platform specific path separators --- src/main/scala/scoverage/ScoverageSbtPlugin.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala index 2a2cf467..b5ac6601 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -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 { From 6f968634df51b1bdd09a772d009c19b3289e4b0e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 17 Feb 2025 21:54:16 +0000 Subject: [PATCH 43/51] Update scalafmt-core to 3.9.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a3e40488..df9765cf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.8.6" +version = "3.9.0" project.git = true runner.dialect = "scala213" From af3088d69f8e71be1afa8c7004ef94f79a6ec2d4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 23 Feb 2025 19:31:59 +0000 Subject: [PATCH 44/51] Update scalafmt-core to 3.9.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index df9765cf..c83aa669 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.9.0" +version = "3.9.1" project.git = true runner.dialect = "scala213" From 6e226bcd56c01a22302933d5b080d5c96eaaef65 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 3 Mar 2025 20:55:05 +0000 Subject: [PATCH 45/51] Update sbt, scripted-plugin to 1.10.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 73df629a..96d8db79 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.10.9 From 0406dcc00ca780fa79d96eb72651349cc7f49776 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 1 Mar 2025 19:33:18 +0000 Subject: [PATCH 46/51] Update scalafmt-core to 3.9.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c83aa669..878faa29 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.9.1" +version = "3.9.2" project.git = true runner.dialect = "scala213" From ac7dfc665845c8c3c4f060cba82ef10ed8037932 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 8 Mar 2025 04:41:47 +0000 Subject: [PATCH 47/51] Update scalafmt-core to 3.9.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 878faa29..1befd704 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.9.2" +version = "3.9.3" project.git = true runner.dialect = "scala213" From ee9095ffb5cc6c728d07c6a0e0687e6d1de608dc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 5 Mar 2025 22:52:56 +0000 Subject: [PATCH 48/51] Update sbt, scripted-plugin to 1.10.10 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 96d8db79..e97b2722 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.9 +sbt.version=1.10.10 From 73c763841def09aa6d3a26cfe3be84f08e29b0d1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Mar 2025 00:11:58 +0000 Subject: [PATCH 49/51] Update sbt-ci-release to 1.9.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5df90542..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.9.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") From 171cd34f38dda57e1796fc7ebec3574dbd13fdf6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Mar 2025 00:12:05 +0000 Subject: [PATCH 50/51] Update scalafmt-core to 3.9.4 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1befd704..a834d75a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.9.3" +version = "3.9.4" project.git = true runner.dialect = "scala213" From 18923410dfc8d3583cef05bf5f88ae21fb86bfae Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 18 Mar 2025 00:20:30 +0000 Subject: [PATCH 51/51] Update sbt, scripted-plugin to 1.10.11 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e97b2722..cc68b53f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.10 +sbt.version=1.10.11