From d93de7f575df14a7c10535ff7abd65bee42c88fa Mon Sep 17 00:00:00 2001
From: Gary Tierney <gary.tierney@fastmail.com>
Date: Wed, 17 Jul 2019 05:36:08 +0100
Subject: [PATCH] Clean-up JaCoCo coverage generation

---
 azure-pipelines.yml        |  2 +-
 gradle/code-quality.gradle |  4 ++++
 gradle/testing.gradle      | 18 ++++--------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2167045f..2022dfe0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,7 +29,7 @@ steps:
       jdkArchitectureOption: 'x64'
       publishJUnitResults: true
       testResultsFiles: '**/TEST-*.xml'
-      tasks: 'check jacocoTestReport sonarqube'
+      tasks: 'check jacocoReport sonarqube'
 
   - script: |
       ./gradlew --stop
diff --git a/gradle/code-quality.gradle b/gradle/code-quality.gradle
index 98b7506f..6f4da429 100644
--- a/gradle/code-quality.gradle
+++ b/gradle/code-quality.gradle
@@ -15,5 +15,9 @@ detekt {
 sonarqube {
     properties {
         property "sonar.kotlin.detekt.reportPaths", detektAggregateReport
+        property "sonar.organization", "apollo-rsps"
+        property "sonar.projectKey", "apollo:org.apollo"
+        property "sonar.projectName", "Apollo RSPS"
+        property "sonar.kotlin.file.suffixes", ".kt,.kts"
     }
 }
\ No newline at end of file
diff --git a/gradle/testing.gradle b/gradle/testing.gradle
index 5b3a7cd1..01a6e4ec 100644
--- a/gradle/testing.gradle
+++ b/gradle/testing.gradle
@@ -36,9 +36,9 @@ gradle.projectsEvaluated {
 
 
     task jacocoReport(type: JacocoReport) {
-        sourceDirectories = files()
-        classDirectories = files()
-        executionData = files()
+        sourceDirectories.setFrom(files())
+        classDirectories.setFrom(files())
+        executionData.setFrom(files())
 
         reports {
             html.enabled = true
@@ -63,19 +63,9 @@ gradle.projectsEvaluated {
                 additionalClassDirs((FileCollection) subproject.sourceSets.main.output)
             }
 
-            executionData = files(jacocoCoverageAggregate)
+            executionData.setFrom(files(jacocoCoverageAggregate))
         }
 
         dependsOn(jacocoMerge)
     }
-
-    sonarqube {
-        properties {
-            property "sonar.organization", "apollo-rsps"
-            property "sonar.projectKey", "apollo:org.apollo"
-            property "sonar.projectName", "Apollo RSPS"
-            property "sonar.kotlin.file.suffixes", ".kt,.kts"
-            property "sonar.jacoco.reportPaths", jacocoCoverageAggregate
-        }
-    }
 }