Scala 3 support; Scoverage v2.0.7

Lookup Scala version at the right time to avoid forcing early dependency resolution

Author: msigmond

build.gradle

@@ -46,8 +46,8 @@ targetCompatibility = '1.8'
 
 
 dependencies {
-    compileOnly "org.scoverage:scalac-scoverage-plugin_2.13.8:2.0.5"
-    compileOnly "org.scoverage:scalac-scoverage-reporter_2.13:2.0.5"
+    compileOnly "org.scoverage:scalac-scoverage-plugin_2.13.8:2.0.7"
+    compileOnly "org.scoverage:scalac-scoverage-reporter_2.13:2.0.7"
     implementation group: 'commons-io', name: 'commons-io', version: '2.6'
 
     testImplementation 'junit:junit:4.12'

src/crossScalaVersionTest/resources/projects/scala-multi-module-cross-version/2_12/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation group: 'org.scala-lang', name: 'scala-library', version: "2.12.8"
+    implementation group: 'org.scala-lang', name: 'scala-library', version: "2.12.17"
     testImplementation group: 'org.scalatest', name: "scalatest_2.12", version: scalatestVersion
 }

src/crossScalaVersionTest/resources/projects/scala-multi-module-cross-version/2_13/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation group: 'org.scala-lang', name: 'scala-library', version: "2.13.1"
+    implementation group: 'org.scala-lang', name: 'scala-library', version: "2.13.10"
     testImplementation group: 'org.scalatest', name: "scalatest_2.13", version: scalatestVersion
 }

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

@@ -51,12 +51,9 @@ class ScoveragePlugin implements Plugin<PluginAware> {
             project.logger.info("Project ${project.name} already has the scoverage plugin")
             return
         }
-
         project.logger.info("Applying scoverage plugin to $project.name")
-        def extension = project.extensions.create('scoverage', ScoverageExtension, project)
-
-        def scalaVersion = resolveScalaVersions(project)
 
+        def extension = project.extensions.create('scoverage', ScoverageExtension, project)
         if (!project.configurations.asMap[CONFIGURATION_NAME]) {
             project.configurations.create(CONFIGURATION_NAME) {
                 visible = false
@@ -65,6 +62,8 @@ class ScoveragePlugin implements Plugin<PluginAware> {
             }
 
             project.afterEvaluate {
+                def scalaVersion = resolveScalaVersions(project)
+
                 def scoverageVersion = project.extensions.scoverage.scoverageVersion.get()
                 project.logger.info("Using scoverage scalac plugin $scoverageVersion for scala $scalaVersion")
 
@@ -82,10 +81,10 @@ class ScoveragePlugin implements Plugin<PluginAware> {
             }
         }
 
-        createTasks(project, extension, scalaVersion)
+        createTasks(project, extension)
     }
 
-    private void createTasks(Project project, ScoverageExtension extension, ScalaVersion scalaVersion) {
+    private void createTasks(Project project, ScoverageExtension extension) {
 
         ScoverageRunner scoverageRunner = new ScoverageRunner(project.configurations.scoverage)
 
@@ -170,6 +169,7 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                     parameters.addAll(existingParameters)
                 }
 
+                def scalaVersion = resolveScalaVersions(project)
                 if (scalaVersion.majorVersion < 3) {
                     parameters.add("-P:scoverage:dataDir:${extension.dataDir.get().absolutePath}".toString())
                     parameters.add("-P:scoverage:sourceRoot:${extension.project.getRootDir().absolutePath}".toString())