Fix aggregate JaCoCo task and add codecov integration to Azure

.travis.yml

@@ -36,10 +36,9 @@ install:
 script:
   # Only run code generation tests on OSX -- linux requires sudo to install OpenCV dependencies, and that environment
   # will not be able to run MainWindowTest.testDragOperationFromPaletteToPipeline
-  - ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests;
+  - ./gradlew check --stacktrace -Pheadless=true -PlogTests;
 
 after_success:
-  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov         ; fi
   - .travis-scripts/push-javadoc-to-gh-pages.sh
   - .travis-scripts/before-deploy.sh
 

appveyor.yml

@@ -6,7 +6,7 @@ build_script:
 
 # to run your custom scripts instead of automatic tests
 test_script:
-  - gradlew.bat check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan
+  - gradlew.bat check --stacktrace -Pheadless=true -PlogTests -Dscan
 
 platform:
   - x64

azure-pipelines.yml

@@ -31,14 +31,11 @@ jobs:
           publishJUnitResults: false
           tasks: 'check jacocoTestReport jacocoRootReport jfxNative -Pgeneration -PjniLocation=build/OpenCVJNI -Pheadless=true -PlogTests --stacktrace'
 
-      # Publish JaCoCo code coverage results from the build
-      - task: PublishCodeCoverageResults@1
-        inputs:
-          codeCoverageTool: 'JaCoCo'
-          summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/reports/jacoco/test/jacocoTestReport.xml'
-          reportDirectory: '$(System.DefaultWorkingDirectory)/**/reports/jacoco/test/jacocoTestReport.html'
-          additionalCodeCoverageFiles: '$(System.DefaultWorkingDirectory)/**/build/jacoco/text.exec'
-          failIfCoverageEmpty: false
+      - script: |
+          curl -s https://codecov.io/bash > .codecov
+          chmod +x .codecov
+          ./.codecov -t $(CODECOV_TOKEN)
+        displayName: 'Upload jacoco reports to codecov'
 
       - task: CopyFiles@2
         inputs:

build.gradle.kts

@@ -159,22 +159,20 @@ tasks.register<JacocoReport>("jacocoRootReport") {
     group = "Coverage reports"
     description = "Generates an aggregate report from all subprojects"
 
-    reports {
-        html.isEnabled = true
-        xml.isEnabled = true
-    }
+    // Based on the codecov Gradle example: https://github.com/codecov/example-gradle
 
     javaSubprojects {
-        val sourceSets = (this as ExtensionAware).extensions.getByName("sourceSets") as SourceSetContainer
-        dependsOn(tasks["test"])
-        val srcFiles = files(sourceSets["main"].allSource.srcDirs)
-        additionalSourceDirs(srcFiles)
-        sourceDirectories.from(srcFiles)
-        classDirectories.from(files(sourceSets["main"].output))
-        executionData.from(tasks.named<JacocoReport>("jacocoTestReport").map { it.executionData })
-    }
-    doFirst {
-        executionData.setFrom(files(executionData.files.filter { it.exists() }))
+        this@register.sourceSets(sourceSets["main"])
+        this@register.dependsOn(tasks.named<JacocoReport>("jacocoTestReport"))
+    }
+
+    executionData(fileTree(rootDir.absolutePath).include("**/build/jacoco/*.exec"))
+
+    reports {
+        xml.isEnabled = true
+        xml.destination = buildDir.resolve("reports/jacoco/report.xml")
+        html.isEnabled = false
+        csv.isEnabled = false
     }
 }