Skip to content

Commit aaff04c

Browse files
authored
Merge pull request #320 from blast-hardcheese/build-cross-version-full
Build CrossVersion.full
2 parents d45e59b + 192db28 commit aaff04c

File tree

2 files changed

+42
-3
lines changed

2 files changed

+42
-3
lines changed

.github/workflows/pr.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: pr
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- 'doc/**'
7+
- 'docs/**'
8+
- '*.md'
9+
10+
jobs:
11+
scala:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
java: [ '11' ]
16+
scala: [
17+
{ version: '2.12.13' },
18+
{ version: '2.12.12' },
19+
{ version: '2.12.11' },
20+
{ version: '2.12.10' },
21+
{ version: '2.13.4' },
22+
{ version: '2.13.3' },
23+
{ version: '2.13.2' },
24+
{ version: '2.13.1' },
25+
{ version: '2.13.0' }
26+
]
27+
steps:
28+
- name: checkout the repo
29+
uses: actions/checkout@v2
30+
with:
31+
fetch-depth: 0
32+
33+
- name: Set up JDK
34+
uses: actions/setup-java@v1
35+
with:
36+
java-version: ${{ matrix.java }}
37+
38+
- name: run tests
39+
run: sbt ++${{ matrix.scala.version }} test scripted

src/main/scala/scoverage/ScoverageSbtPlugin.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ object ScoverageSbtPlugin extends AutoPlugin {
5555
libraryDependencies ++= {
5656
if (coverageEnabled.value)
5757
Seq(
58-
// We only add for "compile"" because of macros. This setting could be optimed to just "test" if the handling
58+
// We only add for "compile" because of macros. This setting could be optimed to just "test" if the handling
5959
// of macro coverage was improved.
60-
OrgScoverage %% (scalacRuntime(libraryDependencies.value)) % coverageScalacPluginVersion.value,
60+
(OrgScoverage %% (scalacRuntime(libraryDependencies.value)) % coverageScalacPluginVersion.value).cross(CrossVersion.full),
6161
// We don't want to instrument the test code itself, nor add to a pom when published with coverage enabled.
62-
OrgScoverage %% ScalacPluginArtifact % coverageScalacPluginVersion.value % ScoveragePluginConfig.name
62+
(OrgScoverage %% ScalacPluginArtifact % coverageScalacPluginVersion.value % ScoveragePluginConfig.name).cross(CrossVersion.full)
6363
)
6464
else
6565
Nil

0 commit comments

Comments
 (0)