From 78eac8dc6007b89056548b3986a3abd5dcfbf29a Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Fri, 5 Feb 2021 15:31:46 -0800 Subject: [PATCH 1/3] Typo --- 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 04b4d41f..937983f4 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -55,7 +55,7 @@ object ScoverageSbtPlugin extends AutoPlugin { libraryDependencies ++= { if (coverageEnabled.value) Seq( - // We only add for "compile"" because of macros. This setting could be optimed to just "test" if the handling + // We only add for "compile" because of macros. This setting could be optimed to just "test" if the handling // of macro coverage was improved. OrgScoverage %% (scalacRuntime(libraryDependencies.value)) % coverageScalacPluginVersion.value, // We don't want to instrument the test code itself, nor add to a pom when published with coverage enabled. From fb8480eff08c2ab2ddc7179353131049006fe0ff Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Fri, 5 Feb 2021 15:32:08 -0800 Subject: [PATCH 2/3] Depend on the exact bincompat (patch) version of scalac --- 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 937983f4..bf197e3d 100644 --- a/src/main/scala/scoverage/ScoverageSbtPlugin.scala +++ b/src/main/scala/scoverage/ScoverageSbtPlugin.scala @@ -57,9 +57,9 @@ object ScoverageSbtPlugin extends AutoPlugin { Seq( // We only add for "compile" because of macros. This setting could be optimed to just "test" if the handling // of macro coverage was improved. - OrgScoverage %% (scalacRuntime(libraryDependencies.value)) % coverageScalacPluginVersion.value, + (OrgScoverage %% (scalacRuntime(libraryDependencies.value)) % coverageScalacPluginVersion.value).cross(CrossVersion.full), // We don't want to instrument the test code itself, nor add to a pom when published with coverage enabled. - OrgScoverage %% ScalacPluginArtifact % coverageScalacPluginVersion.value % ScoveragePluginConfig.name + (OrgScoverage %% ScalacPluginArtifact % coverageScalacPluginVersion.value % ScoveragePluginConfig.name).cross(CrossVersion.full) ) else Nil From 192db282a85b09a85b8d3bdf550a6c0be5fae0d1 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Fri, 5 Feb 2021 15:37:57 -0800 Subject: [PATCH 3/3] Adding PR workflow --- .github/workflows/pr.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 00000000..0586c18d --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,39 @@ +name: pr + +on: + pull_request: + paths-ignore: + - 'doc/**' + - 'docs/**' + - '*.md' + +jobs: + scala: + runs-on: ubuntu-latest + strategy: + matrix: + java: [ '11' ] + scala: [ + { version: '2.12.13' }, + { version: '2.12.12' }, + { version: '2.12.11' }, + { version: '2.12.10' }, + { version: '2.13.4' }, + { version: '2.13.3' }, + { version: '2.13.2' }, + { version: '2.13.1' }, + { version: '2.13.0' } + ] + steps: + - name: checkout the repo + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + + - name: run tests + run: sbt ++${{ matrix.scala.version }} test scripted