Skip to content

Commit 90149d5

Browse files
authored
Merge branch 'main' into master
2 parents 19a6673 + 17e2575 commit 90149d5

File tree

38 files changed

+578
-336
lines changed

38 files changed

+578
-336
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "monthly"

.github/release-drafter.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
template: |
2+
## What’s Changed
3+
4+
$CHANGES

.github/workflows/ci.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- '*.md'
7+
branches:
8+
- main
9+
pull_request:
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
java: [ '8', '11' ]
17+
18+
steps:
19+
- name: checkout the repo
20+
uses: actions/checkout@v2
21+
with:
22+
fetch-depth: 0
23+
24+
- name: Set up JVM
25+
uses: actions/setup-java@v2
26+
with:
27+
distribution: 'adopt'
28+
java-version: ${{ matrix.java }}
29+
30+
- name: Run tests
31+
run: sbt scripted
32+
33+
formatting:
34+
runs-on: ubuntu-latest
35+
36+
steps:
37+
- name: checkout the repo
38+
uses: actions/checkout@v2
39+
with:
40+
fetch-depth: 0
41+
42+
- name: Set up JVM
43+
uses: actions/setup-java@v2
44+
with:
45+
distribution: 'adopt'
46+
java-version: '8'
47+
48+
- name: Check Formatting
49+
run: sbt scalafmtCheckAll

.github/workflows/release-drafter.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
update_release_draft:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: release-drafter/release-drafter@v5
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Release
2+
on:
3+
push:
4+
branches:
5+
- main
6+
tags: ["*"]
7+
jobs:
8+
publish:
9+
runs-on: ubuntu-20.04
10+
steps:
11+
- uses: actions/checkout@v2
12+
with:
13+
fetch-depth: 0
14+
- uses: actions/setup-java@v2
15+
with:
16+
distribution: 'adopt'
17+
java-version: '11'
18+
- run: sbt ci-release
19+
env:
20+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
21+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
22+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
23+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.scala-steward.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
updates.ignore = [ { groupId = "org.scala-lang" } ]

.scalafmt.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version = "2.7.5"

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

README.md

Lines changed: 73 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
sbt-scoverage
2-
========
1+
# sbt-scoverage
32

4-
sbt-scoverage is a plugin for SBT that integrates the scoverage code coverage library. Find out more about [scoverage](https://github.com/scoverage/scalac-scoverage-plugin).
5-
6-
Join the [scoverage](http://groups.google.com/group/scala-code-coverage-tool)
7-
google group for help, bug reports, feature requests, and general
8-
discussion on scoverage.
9-
10-
[![Build Status](https://travis-ci.org/scoverage/sbt-scoverage.png?branch=master)](https://travis-ci.org/scoverage/sbt-scoverage)
3+
[![Gitter](https://img.shields.io/gitter/room/scoverage/scoverage.svg)](https://gitter.im/scoverage/scoverage)
4+
[![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/)
115
[![License](http://img.shields.io/:license-Apache%202-red.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
12-
[<img src="https://img.shields.io/maven-central/v/org.scoverage/sbt-scoverage.svg?label=latest%20release"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22sbt-scoverage%22)
136

14-
## How to use
7+
sbt-scoverage is a plugin for sbt that integrates the scoverage code coverage
8+
library. Find out more about
9+
[scoverage here](https://github.com/scoverage/scalac-scoverage-plugin).
1510

16-
Make sure your SBT version in project/build.properties:
17-
```
18-
sbt.version = 0.13.17
19-
```
20-
or
21-
```
22-
sbt.version = 1.1.1
23-
```
11+
## Setup
2412

25-
Add the plugin in project/plugins.sbt:
13+
**Requirements**: Requires sbt 1.2.8 or above
14+
15+
In `project/plugins.sbt`:
2616
```scala
27-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
17+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "x.x.x")
2818
```
2919

20+
## Usage
21+
3022
Run the tests with enabled coverage:
3123
```
3224
$ sbt clean coverage test
@@ -37,7 +29,7 @@ $ sbt clean coverage it:test
3729
```
3830

3931
To enable coverage directly in your build, use:
40-
```
32+
```scala
4133
coverageEnabled := true
4234
```
4335

@@ -46,46 +38,40 @@ To generate the coverage reports run
4638
$ sbt coverageReport
4739
```
4840

49-
Coverage reports will be in `target/scoverage-report`. 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.
50-
51-
If you're running the coverage reports from within an sbt console session (as
52-
opposed to one command per sbt launch), then the `coverage` command is sticky. To
53-
turn it back off when you're done running reports, use the `coverageOff` command or reset `coverageEnabled` with `set coverageEnabled := false`.
54-
55-
Sample project with scoverage in both sbt and maven - [the scoverage samples project](https://github.com/scoverage/sbt-scoverage-samples).
56-
57-
## Notes on upgrading to version 1.3.0
58-
59-
* The object containing the keys has changed from nested to top level so you might need to adjust the import. It's also an auto plugin now, so you might not need the import at all.
60-
* There is an issue syncing the binary with the sbt-plugin-releases repo, so in the meantime add `resolvers += Resolver.url("scoverage-bintray", url("https://dl.bintray.com/sksamuel/sbt-plugins/"))(Resolver.ivyStylePatterns)` to your build.
61-
62-
## Notes on upgrading to version 1.0.0
41+
Coverage reports will be in your `target/scala-<scala-version>/scoverage-report`
42+
directory. There are HTML and XML reports. The XML is useful if you need to
43+
programatically use the results, or if you're writing a tool.
6344

64-
If you are upgrading from 0.99.x then you must remove the `instrumentSettings` from your build.sbt or Build.scala, as that is no longer needed.
45+
**NOTE**: If you're running the coverage reports from within an sbt console
46+
session (as opposed to one command per sbt launch), then the `coverage` command
47+
is sticky. To turn it back off when you're done running reports, use the
48+
`coverageOff` command or reset `coverageEnabled` with `set coverageEnabled :=
49+
false`.
6550

66-
Next, the keys have been renamed slightly. The new names begin with coverageXXX, eg coverageExcludedPackages and some have had their full name changed. You can see a full list of keys by opening the object ScoverageKeys.
51+
### Multi project reports
6752

68-
## Multi project reports
53+
By default, scoverage will generate reports for each project separately. You can
54+
merge them into an aggregated report by using the following:
6955

70-
By default, scoverage will generate reports for each project seperately. You can merge them into an aggregated report by invoking `sbt coverageAggregate`.
71-
72-
(Note, you must do this after all the coverage data is complete as a separate command, so you cannot do `sbt coverage test coverageAggregate` (at least until a way around this is found).)
56+
```
57+
$ sbt coverageAggregate
58+
```
7359

74-
(You must have first run `sbt coverageReport` for `coverageAggregate` to work. It aggregates over the sub-projects' report xml rather than over the coverage data directly.)
60+
**NOTE**: You do not need to run `coverageReport` before `coverageAggregate`; it
61+
aggregates over the sub-projects' coverage data directly, not the report xml.
7562

76-
## Exclude classes and packages
63+
### Exclude classes and packages
7764

78-
You can exclude classes from being considered for coverage measurement by providing semicolon-separated list of
79-
regular expressions.
65+
You can exclude classes from being considered for coverage measurement by
66+
providing semicolon-separated list of regular expressions.
8067

81-
Example:
8268
```scala
8369
coverageExcludedPackages := "<empty>;Reverse.*;.*AuthService.*;models\\.data\\..*"
8470
```
8571

86-
The regular expressions are matched against the fully qualified class name, and must match the entire string to take effect.
87-
88-
Any matched classes will not be instrumented or included in the coverage report.
72+
The regular expressions are matched against the fully qualified class name, and
73+
must match the entire string to take effect. Any matched classes will not be
74+
instrumented or included in the coverage report.
8975

9076
You can also mark sections of code with comments like:
9177

@@ -95,67 +81,67 @@ You can also mark sections of code with comments like:
9581
// $COVERAGE-ON$
9682
```
9783

98-
Any code between two such comments will not be instrumented or included in the coverage report.
84+
Any code between two such comments will not be instrumented or included in the
85+
coverage report.
9986

100-
## Minimum coverage
87+
### Minimum coverage
10188

102-
Based on minimum coverage, you can fail the build with the following keys
89+
Based on minimum coverage, you can fail the build with the following keys:
10390

10491
```scala
10592
coverageMinimum := 80
10693
coverageFailOnMinimum := true
10794
```
10895

109-
These settings will be enforced when the reports are generated.
110-
If you generate an aggregate report using `coverageAggregate` then these settings will apply to that report.
96+
These settings will be enforced when the reports are generated. If you generate
97+
an aggregate report using `coverageAggregate` then these settings will apply to
98+
that report.
11199

112-
## Highlighting
113-
114-
If you are using Scala 2.11.1 or less, then highlighting will not work (due to this bug which was fixed in 2.11.2 https://github.com/scala/scala/pull/3799). In that case you must disable highlighting by adding the following to your build:
115-
116-
```scala
117-
coverageHighlighting := false
118-
```
100+
## Trouble-shooting failing tests
119101

120-
## Failing tests
121-
Scoverage does a lot of file writing behind the scenes in order to track which statements have been executed.
122-
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:
102+
scoverage does a lot of file writing behind the scenes in order to track which
103+
statements have been executed. If you are running into a scenario where your
104+
tests normally pass, but fail when scoverage is enabled, then the culprit can be
105+
one of the following:
123106

124107
* timing issues on futures and other async operations, try upping the timeouts by an order of magnitude.
125108
* tests are run in a sandbox mode (such as with `java.security.PrivilegedAction<T>`), try running the tests outside of the sandbox.
126109

110+
## Example project
111+
112+
[the scoverage samples project](https://github.com/scoverage/sbt-scoverage-samples).
113+
127114
## Integrations
128115

129116
### Codacy
130117

131-
[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 [sbt-codacy-coverage plugin](https://github.com/codacy/sbt-codacy-coverage).
118+
[Codacy](https://www.codacy.com) integrates with your favorite coverage tool to
119+
provide an in-depth overlook of your project status. scoverage information can
120+
be integrated into Codacy through the
121+
[codacy-coverage-reporter](https://github.com/codacy/codacy-coverage-reporter).
132122

133123
### Coveralls
134124

135-
If you have an open source project then you can add code coverage metrics with the excellent website https://coveralls.io/ Scoverage will integrate with coveralls using the [sbt-coveralls](https://github.com/scoverage/sbt-coveralls) plugin.
125+
If you have an open source project then you can add code coverage metrics with
126+
the [Coveralls](https://coveralls.io/). scoverage will integrate with coveralls
127+
using the [sbt-coveralls](https://github.com/scoverage/sbt-coveralls) plugin.
136128

137-
### Plugin for SonarQube
129+
### Codecov
138130

139-
If you want to visually browse statement coverage reports then use this [plugin for SonarQube](https://github.com/RadoBuransky/sonar-scoverage-plugin).
140-
It allows you to review overall project statement coverage as well as dig deeper into sub-modules, directories and
141-
source code files to see uncovered statements. Statement coverage measurement can become an integral part of your
142-
team's continuous integration process and a required quality standard.
131+
You can integrate with [Codecov](https://about.codecov.io/) easily sending your
132+
reports there via your CI. You can see an example of this here in
133+
[codecov/example-scala](https://github.com/codecov/example-scala).
143134

144-
## License
145-
```
146-
This software is licensed under the Apache 2 license, quoted below.
147-
148-
Copyright 2013-2016 Stephen Samuel and contributors
135+
### Plugin for SonarQube
149136

150-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
151-
use this file except in compliance with the License. You may obtain a copy of
152-
the License at
137+
If you want to visually browse statement coverage reports then use this [plugin
138+
for SonarQube](https://github.com/RadoBuransky/sonar-scoverage-plugin). It
139+
allows you to review overall project statement coverage as well as dig deeper
140+
into sub-modules, directories and source code files to see uncovered statements.
141+
Statement coverage measurement can become an integral part of your team's
142+
continuous integration process and a required quality standard.
153143

154-
http://www.apache.org/licenses/LICENSE-2.0
144+
## Release Notes
155145

156-
Unless required by applicable law or agreed to in writing, software
157-
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
158-
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
159-
License for the specific language governing permissions and limitations under
160-
the License.
161-
```
146+
For any information on releases and upgrading, please refer to the [release
147+
page](https://github.com/scoverage/sbt-scoverage/releases).

0 commit comments

Comments
 (0)