Merge pull request #216 from gliptak/jacocoroot

mperry · mperry · commit 780cc5980eda · 2016-02-05T02:58:35.000+10:00
Process coverage for all subprojects
diff --git a/.travis.yml b/.travis.yml
@@ -17,4 +17,4 @@ script:
   - ./gradlew build coverage -s -i
 
 after_success:
-  - ./gradlew coverage coveralls -s -i
+  - ./gradlew jacocoRootReport coveralls
diff --git a/build.gradle b/build.gradle
@@ -19,15 +19,14 @@ buildscript {
     dependencies {
         classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"
         classpath "me.tatarka:gradle-retrolambda:$retrolambdaVersion"
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
     }
 }
 
 
 apply plugin: "jacoco"
 apply plugin: 'com.github.kt3k.coveralls'
 
-
 if (JavaVersion.current().isJava8Compatible()) {
     allprojects {
         tasks.withType(Javadoc) {
@@ -100,14 +99,9 @@ subprojects {
         repositories {
             mavenCentral()
         }
-
-        dependencies {
-            classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1'
-        }
     }
 
     apply plugin: "jacoco"
-    apply plugin: 'com.github.kt3k.coveralls'
 
     apply from: "$rootDir/lib.gradle"
 	apply plugin: "java"
@@ -214,3 +208,23 @@ configure(subprojects.findAll { it.name != "props-core" }) {
 task env << {
 	println System.getenv()
 }
+
+task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.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 ="${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+	}
+	// We could remove the following setOnlyIf line, but then
+	// jacocoRootReport would silently be SKIPPED if something with
+	// the projectsWithUnitTests is wrong (e.g. a project is missing
+	// in there).
+	setOnlyIf { true }
+}
+
+coveralls {
+	sourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs).files.absolutePath
+}
