From 1e806e3658c7ce065803a8b0e01aa39037fa96ff Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 11 Mar 2018 11:52:24 +0100 Subject: [PATCH] Added cache module to code coverage reports. Signed-off-by: Yahor Berdnikau --- .circleci/config.yml | 2 +- gradle_scripts/jacoco.gradle | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8fea41d8..367a35bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: - run: name: unit-tests command: | - ./gradlew :subsonic-api:test :ultrasonic:testDebugUnitTest + ./gradlew :subsonic-api:test :cache:test :ultrasonic:testDebugUnitTest ./gradlew jacocoFullReport bash <(curl -s https://codecov.io/bash) - run: diff --git a/gradle_scripts/jacoco.gradle b/gradle_scripts/jacoco.gradle index 67a75609..5be89860 100644 --- a/gradle_scripts/jacoco.gradle +++ b/gradle_scripts/jacoco.gradle @@ -6,9 +6,11 @@ task jacocoMergeReports(type: JacocoMerge) { def subsonicApi = project.findProject("subsonic-api") def ultrasonicApp = project.findProject("ultrasonic") + def cache = project.findProject("cache") executionData( "${subsonicApi.buildDir}/jacoco/test.exec", "${ultrasonicApp.buildDir}/jacoco/testDebugUnitTest.exec", + "${cache.buildDir}/jacoco/test.exec" ) destinationFile(file("${project.buildDir}/jacoco/jacoco.exec")) } @@ -20,6 +22,7 @@ def createJacocoFullReportTask() { def subsonicApi = project.findProject("subsonic-api") def ultrasonicApp = project.findProject("ultrasonic") + def cache = project.findProject("cache") classDirectories = files( fileTree( @@ -29,6 +32,10 @@ def createJacocoFullReportTask() { fileTree( dir: "${ultrasonicApp.buildDir}/intermediates/classes/debug/org", excludes: ultrasonicApp.jacocoExclude + ), + fileTree( + dir: "${cache.buildDir}/classes/kotlin/main", + excludes: cache.jacocoExclude ) ) sourceDirectories = files(subsonicApi.sourceSets.main.getAllSource(),