diff --git a/.travis.yml b/.travis.yml index c8234a84..d9f3e3ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,5 @@ script: gradle check --stacktrace after_success: - JAVAC_VERSION=$((javac -version) 2>&1) # Only run jacocoRootReport in the Java 8 build - # - if [[ "$JAVAC_VERSION" = javac\ 1.8.* ]]; then gradle jacocoRootReport coveralls; fi - - if [[ "$JAVAC_VERSION" = javac\ 1.8.* ]]; then gradle jacocoTestReport coveralls; fi + - if [[ "$JAVAC_VERSION" = javac\ 1.8.* ]]; then gradle jacocoRootReport coveralls; fi diff --git a/build.gradle b/build.gradle index 9b417bb5..f178303d 100644 --- a/build.gradle +++ b/build.gradle @@ -221,8 +221,12 @@ coveralls { sourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs).files.absolutePath } -/* + task jacocoRootReport(type: JacocoReport) { + dependsOn = subprojects.jacocoTestReport + sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs) + classDirectories = files(subprojects.sourceSets.main.output) + executionData = files(subprojects.jacocoTestReport.executionData) reports { xml.enabled true xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") @@ -233,7 +237,7 @@ task jacocoRootReport(type: JacocoReport) { // in there). setOnlyIf { true } } -*/ + task javadocAll(type: Javadoc) { source subprojects.collect {project ->