upgrade to gradle 8.1.1

Author: maiflai

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java-gradle-plugin'
-    id "com.gradle.plugin-publish" version "1.0.0"
+    id "com.gradle.plugin-publish" version "1.1.0"
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.0"
 }
 
@@ -22,22 +22,19 @@ 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'
+            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'
 
@@ -117,7 +114,7 @@ gradlePlugin {
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {
     from "$buildDir/docs/groovydoc"
-    classifier 'groovydoc'
+    archiveClassifier.set('groovydoc')
 }
 
 def propOrDefault(String property) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/functionalTest/java/org/scoverage/ScoverageFunctionalTest.java

@@ -122,8 +122,8 @@ private void configureArguments(String... arguments) {
         List<String> fullArguments = new ArrayList<>();
 
         fullArguments.add("-PscalaVersionMajor=2");
-        fullArguments.add("-PscalaVersionMinor=12");
-        fullArguments.add("-PscalaVersionBuild=17");
+        fullArguments.add("-PscalaVersionMinor=13");
+        fullArguments.add("-PscalaVersionBuild=10");
         fullArguments.add("-PjunitVersion=5.3.2");
         fullArguments.add("-PjunitPlatformVersion=1.3.2");
         fullArguments.add("-PscalatestVersion=3.0.8");

src/functionalTest/resources/projects/scala-multi-module-multiple-test-tasks/build.gradle

@@ -25,36 +25,35 @@ allprojects {
         testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
     }
 
-    test {
-        useJUnitPlatform()
-        maxParallelForks = 1
-    }
-
-    configurations {
-        intTestImplementation.extendsFrom testImplementation
-        intTestRuntimeOnly.extendsFrom testRuntimeOnly
-    }
-    sourceSets {
-        intTest {
-            resources.srcDir file('src/intTest/resources')
-            scala {
-                compileClasspath += main.output + test.output
-                runtimeClasspath += main.output + test.output
-                srcDir file("${projectDir}/src/intTest/scala")
+    testing {
+        suites {
+            configureEach {
+                useJUnit()
+                targets.configureEach {
+                    testTask.configure {
+                        maxParallelForks = 1
+                    }
+                }
+            }
+            intTest(JvmTestSuite) {
+                testType = TestSuiteType.INTEGRATION_TEST
+                // dependencies { ... } does not appear to work as advertised?
+                sources {
+                    scala {
+                        compileClasspath += sourceSets.test.compileClasspath + sourceSets.main.output + sourceSets.test.output
+                        runtimeClasspath += sourceSets.test.runtimeClasspath
+                    }
+                }
+                targets.configureEach {
+                    testTask.configure{
+                        outputs.upToDateWhen { false }
+                        mustRunAfter(test)
+                    }
+                }
             }
         }
     }
-
-
-    task intTest(type: Test) {
-        testClassesDirs = sourceSets.intTest.output.classesDirs
-        classpath = sourceSets.intTest.runtimeClasspath
-        outputs.upToDateWhen { false }
-
-        maxParallelForks = 1
-    }
-    check.dependsOn(intTest)
-    intTest.mustRunAfter(test)
+    check.dependsOn(testing.suites.intTest)
 
     scoverage {
         minimumRate = 0.5

src/functionalTest/resources/projects/scala-single-module-multiple-test-tasks/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'io.spring.dependency-management' version "1.0.4.RELEASE"
     id 'org.scoverage'
+    id 'jvm-test-suite'
 }
 
 repositories {
@@ -27,39 +28,35 @@ dependencies {
     testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
 }
 
-test {
-    useJUnitPlatform()
-}
-
-
-configurations {
-    intTestImplementation.extendsFrom testImplementation
-    intTestRuntimeOnly.extendsFrom testRuntimeOnly
-}
-sourceSets {
-    intTest {
-        resources.srcDir file('src/intTest/resources')
-        scala {
-            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
-            srcDir file("${projectDir}/src/intTest/scala")
+testing {
+    suites {
+        configureEach {
+            useJUnit()
+            targets.configureEach {
+                testTask.configure {
+                    maxParallelForks = 1
+                }
+            }
+        }
+        intTest(JvmTestSuite) {
+            testType = TestSuiteType.INTEGRATION_TEST
+            // dependencies { ... } does not appear to work as advertised?
+            sources {
+                scala {
+                    compileClasspath += sourceSets.test.compileClasspath + sourceSets.main.output + sourceSets.test.output
+                    runtimeClasspath += sourceSets.test.runtimeClasspath
+                }
+            }
+            targets.configureEach {
+                testTask.configure{
+                    outputs.upToDateWhen { false }
+                    mustRunAfter(test)
+                }
+            }
         }
     }
 }
-
-test {
-    maxParallelForks = 1
-}
-
-task intTest(type: Test) {
-    testClassesDirs = sourceSets.intTest.output.classesDirs
-    classpath = sourceSets.intTest.runtimeClasspath
-    outputs.upToDateWhen { false }
-
-    maxParallelForks = 1
-}
-check.dependsOn(intTest)
-intTest.mustRunAfter(test)
+check.dependsOn(testing.suites.intTest)
 
 scoverage {
     minimumRate = 0.6

src/main/groovy/org/scoverage/ScoveragePlugin.groovy

@@ -212,7 +212,7 @@ class ScoveragePlugin implements Plugin<PluginAware> {
 
             compileTask.configure {
                 doFirst {
-                    destinationDir.deleteDir()
+                    destinationDirectory.get().getAsFile().deleteDir()
                 }
 
                 // delete non-instrumented classes by comparing normally compiled classes to those compiled with scoverage