.github/workflows/gradle.yml

@@ -11,8 +11,19 @@ on:
 
 jobs:
   build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: 'ignore warnings'
+            additional-check-args: ''
+            continue-on-error: false
+          - name: 'fail on warning'
+            additional-check-args: '--warning-mode=fail -PfailOnWarning'
+            continue-on-error: true
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.continue-on-error }}
 
     steps:
     - uses: actions/checkout@v2
@@ -24,4 +35,4 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew --info --stacktrace check
+      run: ./gradlew --info --stacktrace check ${{ matrix.additional-check-args }}

README.md

@@ -43,7 +43,7 @@ You can find instructions on how to apply the plugin at http://plugins.gradle.or
 The plugin exposes multiple options that can be configured by setting them in an `scoverage` block within the project's
 build script. These options are as follows:
 
-* `scoverageVersion = <String>` (default `"1.4.8`): The version of the scoverage scalac plugin. This (gradle) plugin
+* `scoverageVersion = <String>` (default `"2.1.1`): The version of the scoverage scalac plugin. This (gradle) plugin
 should be compatible with all 1+ versions.
 
 * `scoverageScalaVersion = <String>` (default `detected`): The scala version of the scoverage scalac plugin. This
@@ -64,6 +64,10 @@ required for the validation to pass (otherwise `checkScoverage` will fail the bu
 `checkScoverage` task. For more information on the different types, please refer to the documentation of the scalac
 plugin (https://github.com/scoverage/scalac-scoverage-plugin).
 
+* `excludedFiles = <files>` (default `not set`): Comma separated list of regexes for files to exclude from coverage.
+
+* `excludedPackages = <packages, classes and modules>` (default `not set`): Comma separated list of regexes for packages, classes and modules to exclude from coverage.
+
 #### Multiple check tasks
 
 It is possible to configure multiple checks; for instance, one check for a statement rate and another for a branch rate:
@@ -103,26 +107,29 @@ scoverage {
         coverageType = CoverageType.Statement
     }
 }
-``` 
-
-### Run without normal compilation
-
-By default, running any of the plugin tasks will compile the code both using "normal" compilation (`compileScala`)
-and using the scoverage scalac plugin (`compileScoverageScala`).
-
-In cases where you only wish to generate reports / validate coverage, but are not interested in publishing the code,
-it is possible to only compile the code with the scoverage scalac plugin, thus reducing build times significantly.
-In order to do so, simply add the arguments `-PscoverageCompileOnly` to the gradle execution.
-For example: `gradle reportScoverage -PscoverageCompileOnly`.
+```
 
-Note that this mode is incompatible with parallel builds in multi-module projects.
+In case you use the Kotlin DSL, the following snippet can give you pointers for configuring Scoverage:
+```kotlin
+scoverage {
+	minimumRate.set(BigDecimal("0.80"))
+	excludedPackages.set(listOf<String>("com.example.scala.demo"))
+}
+```
 
 ### Compatibility with Consistent Versions Plugin
 
 In order for the plugin to work alongside [Palantir's consistent versions plugin](https://github.com/palantir/gradle-consistent-versions),
 the Scala version must be manually configured (via `scoverageScalaVersion`); otherwise, the plugin will attempt to
 resolve the compilation classpath, which is prohibited by the versions plugin.
 
+Migration to 8.x
+----------------
+
+* Requires scoverage 2.0
+* Adds support for Scala 3
+* Drops support for disabling normal compilation
+
 Migration to 7.x
 ----------------
 
@@ -184,4 +191,4 @@ task aggregateScoverage(type: org.scoverage.ScoverageAggregate)
 checkScoverage {
      reportDir = file("$buildDir/scoverage-aggregate")
 }
-```
+```

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java-gradle-plugin'
-    id "com.gradle.plugin-publish" version "0.15.0"
+    id "com.gradle.plugin-publish" version "1.1.0"
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.0"
 }
 
@@ -11,7 +11,7 @@ repositories {
 group 'org.scoverage'
 description = 'gradle-scoverage is a Gradle plugin for calculating code coverage using Scoverage'
 if (project.version == 'unspecified') {
-    version = '7.0.0-SNAPSHOT'
+    version = '8.0.0-SNAPSHOT'
 }
 ext {
     website = 'http://scoverage.org'
@@ -22,31 +22,32 @@ ext {
 }
 
 gradlePlugin {
+    website = project.ext.website
+    vcsUrl = project.ext.vcsUrl
+    description = project.description
     plugins {
         gradleScoverage {
             id = 'org.scoverage'
             implementationClass = 'org.scoverage.ScoveragePlugin'
             displayName = 'Gradle Scoverage plugin'
+            description = 'gradle-scoverage is a Gradle plugin for calculating code coverage using Scoverage'
+            tags.set(['coverage', 'scala', 'scoverage'])
         }
     }
 }
 
-pluginBundle {
-    website = project.website
-    vcsUrl = ext.vcsUrl
-    description = project.description
-    tags = ['coverage', 'scala', 'scoverage']
-}
-
 apply plugin: 'maven-publish'
 apply plugin: 'groovy'
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
-
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
-    compileOnly "org.scoverage:scalac-scoverage-plugin_2.13:1.4.2"
+    compileOnly 'org.scoverage:scalac-scoverage-plugin_2.13.14:2.1.1'
+    compileOnly 'org.scoverage:scalac-scoverage-reporter_2.13:2.1.1'
+
     implementation group: 'commons-io', name: 'commons-io', version: '2.6'
 
     testImplementation 'junit:junit:4.12'
@@ -104,6 +105,8 @@ task functionalTest(type: Test) {
         showStandardStreams = System.env.CI == 'true'
     }
 
+    systemProperty 'failOnWarning', project.hasProperty('failOnWarning')
+
     mustRunAfter crossScalaVersionTest
 }
 check.dependsOn functionalTest
@@ -114,12 +117,7 @@ gradlePlugin {
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {
     from "$buildDir/docs/groovydoc"
-    classifier 'groovydoc'
-}
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier 'sources'
+    archiveClassifier.set('groovydoc')
 }
 
 def propOrDefault(String property) {
@@ -177,7 +175,6 @@ publishing {
             }
             from components.java
             artifact groovydocJar
-            artifact sourcesJar
         }
     }
 }
@@ -187,6 +184,7 @@ if (project.properties.containsKey('signing.keyId')) {
     signing {
         sign publishing.publications.mavenJava
     }
+    project.tasks.publishMavenJavaPublicationToMavenRepository.inputs.files(project.tasks.signMavenJavaPublication)
 }
 
 // see https://stackoverflow.com/questions/44679007
@@ -206,4 +204,4 @@ idea.project.settings {
     taskTriggers {
         beforeBuild fixIdeaPluginClasspath, pluginUnderTestMetadata
     }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists