scoverage#163 Fix remaining deprecation warnings from Gradle 7.1.1

Author: eyalroth

src/functionalTest/resources/projects/scala-java-annotation-processor/build.gradle

@@ -6,7 +6,7 @@ description = 'a multi-module Scala and Java project using a Java annotation pro
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }
 

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

@@ -29,7 +29,8 @@ class ScoveragePlugin implements Plugin<PluginAware> {
 
     static final String DEFAULT_REPORT_DIR = 'reports' + File.separatorChar + 'scoverage'
 
-    private final ConcurrentHashMap<Task, Set<? extends Task>> taskDependencies = new ConcurrentHashMap<>()
+    private final ConcurrentHashMap<Task, Set<? extends Task>> crossProjectTaskDependencies = new ConcurrentHashMap<>()
+    private final ConcurrentHashMap<Task, Set<? extends Task>> sameProjectTaskDependencies = new ConcurrentHashMap<>()
 
     @Override
     void apply(PluginAware pluginAware) {
@@ -195,11 +196,16 @@ class ScoveragePlugin implements Plugin<PluginAware> {
 
                 originalCompileTask.enabled = false;
                 compileTask.destinationDirectory = originalCompileTask.destinationDirectory
-                originalJarTask.mustRunAfter(compileTask)
+
+                project.getTasks().each {
+                    if (recursiveDependenciesOf(it, true).contains(originalCompileTask)) {
+                        it.dependsOn(compileTask)
+                    }
+                }
 
                 // make this project's scoverage compilation depend on scoverage compilation of any other project
                 // which this project depends on its normal compilation
-                def originalCompilationDependencies = recursiveDependenciesOf(compileTask).findAll {
+                def originalCompilationDependencies = recursiveDependenciesOf(compileTask, false).findAll {
                     it instanceof ScalaCompile
                 }
                 originalCompilationDependencies.each {
@@ -382,16 +388,22 @@ class ScoveragePlugin implements Plugin<PluginAware> {
         }
     }
 
-    private Set<? extends Task> recursiveDependenciesOf(Task task) {
-        if (!taskDependencies.containsKey(task)) {
+    private Set<? extends Task> recursiveDependenciesOf(Task task, boolean sameProjectOnly) {
+        def cache = sameProjectOnly ? sameProjectTaskDependencies : crossProjectTaskDependencies
+        if (!cache.containsKey(task)) {
             def directDependencies = task.getTaskDependencies().getDependencies(task)
-            def nestedDependencies = directDependencies.collect { recursiveDependenciesOf(it) }.flatten()
+            if (sameProjectOnly) {
+                directDependencies = directDependencies.findAll {
+                    it.project == task.project
+                }
+            }
+            def nestedDependencies = directDependencies.collect { recursiveDependenciesOf(it, sameProjectOnly) }.flatten()
             def dependencies = directDependencies + nestedDependencies
 
-            taskDependencies.put(task, dependencies)
+            cache.put(task, dependencies)
             return dependencies
         } else {
-            return taskDependencies.get(task)
+            return cache.get(task)
         }
     }
 }