From 83d44ffe29c31af71fdd022e35221a6e7f575478 Mon Sep 17 00:00:00 2001
From: aalmiray <aalmiray@gmail.com>
Date: Thu, 22 Jan 2015 12:35:08 +0100
Subject: [PATCH] Fix travis build

---
 .travis.yml                                   |  7 ++---
 build.gradle                                  | 30 ++++++++++++++++++-
 gradle.properties                             |  1 +
 gradle/code-coverage.gradle                   | 16 +++-------
 .../griffon-jide-swing.gradle                 |  5 +---
 5 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd620c2..c811f2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,15 +4,14 @@ install:
     - TERM=dumb ./gradlew -q assemble
 
 script:
-    - TERM=dumb ./gradlew build cobertura
+    - TERM=dumb ./gradlew build jacocoTestReport jacocoRootReport
 
 jdk:
-    - oraclejdk7
+    - oraclejdk8
 
 before_install:
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
 
 after_success:
-    ./gradlew aggregateCoberturaMerge aggregateCoberturaReport coveralls
-
+    ./gradlew coveralls
diff --git a/build.gradle b/build.gradle
index c82df5f..602b11c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ buildscript {
     dependencies {
         classpath 'org.codehaus.griffon:gradle-griffon-plugin:2.0.0'
         classpath 'org.codehaus.griffon:gradle-griffon-build-plugin:2.0.0'
-        classpath 'net.saliman:gradle-cobertura-plugin:2.2.5'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.1.0'
         classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
@@ -49,6 +48,14 @@ allprojects {
     }
 }
 
+apply plugin: 'jacoco'
+
+jacoco {
+    toolVersion = jacocoVersion
+}
+
+ext.jacocoProjects = []
+
 subprojects { subproj ->
     plugins.withType(JavaPlugin) {
         configurations {
@@ -108,6 +115,8 @@ subprojects { subproj ->
         if (subproj.publishJars.toBoolean()) {
             subproj.apply from: rootProject.file('gradle/docs.gradle')
         }
+
+        subproj.test.testLogging { exceptionFormat 'full' }
     }
 }
 
@@ -129,3 +138,22 @@ githubPages {
 }
 
 publishGhPages.dependsOn(project(":${pluginBaseName}-guide").guide)
+
+coveralls {
+    sourceDirs = files(jacocoProjects.sourceSets.main.allSource.srcDirs).files.absolutePath
+}
+
+task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
+    dependsOn = jacocoProjects.test
+    additionalSourceDirs = files(jacocoProjects.sourceSets.main.allSource.srcDirs)
+    sourceDirectories = files(jacocoProjects.sourceSets.main.allSource.srcDirs)
+    classDirectories =  files(jacocoProjects.sourceSets.main.output)
+    executionData = files(jacocoProjects.jacocoTestReport.executionData)
+    reports {
+        html.enabled = true
+        xml.enabled = true
+        csv.enabled = false
+        html.destination = "${buildDir}/reports/jacoco/test/html"
+        xml.destination = "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index daf03b6..1e690f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,4 @@ javadocFooter=Copyright &copy; 2014 Andres Almiray. All rights reserved.
 jideVersion=3.6.4
 jidefxVersion=0.9.1
 projectLabels=griffon,plugin,jide
+jacocoVersion=0.7.2.201409121644
diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle
index 377d327..07991b5 100644
--- a/gradle/code-coverage.gradle
+++ b/gradle/code-coverage.gradle
@@ -1,17 +1,7 @@
-apply plugin: 'net.saliman.cobertura'
 apply plugin: 'jacoco'
 
-cobertura {
-    coverageFormats = ['html', 'xml']
-    if (project.plugins.hasPlugin('groovy')) {
-        coverageSourceDirs = sourceSets.main.java.srcDirs + sourceSets.main.groovy.srcDirs
-    } else {
-        coverageSourceDirs = sourceSets.main.java.srcDirs
-    }
-}
-
 jacoco {
-    toolVersion = '0.7.2.201409121644'
+    toolVersion = jacocoVersion
 }
 
 jacocoTestReport {
@@ -25,4 +15,6 @@ jacocoTestReport {
         csv.enabled = false
         html.enabled = true
     }
-}
\ No newline at end of file
+}
+
+jacocoProjects << project
\ No newline at end of file
diff --git a/subprojects/griffon-jide-swing/griffon-jide-swing.gradle b/subprojects/griffon-jide-swing/griffon-jide-swing.gradle
index f863c05..cc4da50 100644
--- a/subprojects/griffon-jide-swing/griffon-jide-swing.gradle
+++ b/subprojects/griffon-jide-swing/griffon-jide-swing.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'groovy'
 
-apply from: rootProject.file('gradle/code-coverage.gradle')
-apply from: rootProject.file('gradle/javafx.gradle')
+// apply from: rootProject.file('gradle/code-coverage.gradle')
 
 tasks.withType(JavaCompile) {
     sourceCompatibility = '1.7'
@@ -9,8 +8,6 @@ tasks.withType(JavaCompile) {
 }
 
 dependencies {
-    compileOnly project.files(project.jfxrtLocation)
-
     compile "com.jidesoft:jide-oss:$jideVersion"
     compile 'com.kitfox.svg:svg-salamander:1.0'
     compile "org.codehaus.griffon:griffon-core:${griffonVersion}"