From fbd0dba1c9194a69ad42773d9334e02f1472cea9 Mon Sep 17 00:00:00 2001
From: Chris Smith <chris@dmdirc.com>
Date: Sat, 31 Jan 2015 14:20:19 +0000
Subject: [PATCH] Build process tidying.

- Execute coveralls as part of tests, not afterwards
- Update script to plugins version to allow for files that don't exist
- Use jcenter for DMDirc plugin, to stop idea complaining
---
 build.gradle            | 4 ++--
 circle.yml              | 4 +---
 gradle/coveralls.gradle | 6 +-----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index a0be49b..7d124db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,12 +140,12 @@ def find(name) {
 buildscript {
     repositories {
         mavenCentral()
-        maven { url 'https://dl.bintray.com/dmdirc/releases/' }
+        jcenter()
     }
 
     dependencies {
         classpath group: 'com.dmdirc', name: 'git-version', version: '1.0'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.1.0'
+        classpath group: 'org.kt3k.gradle.plugin', name: 'coveralls-gradle-plugin', version: '2.1.0'
     }
 }
 
diff --git a/circle.yml b/circle.yml
index ee9fbab..17c57fc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,6 +12,4 @@ dependencies:
 
 test:
   override:
-    - ./gradlew check
-  post:
-    - ./gradlew coveralls
+    - ./gradlew test jacocoTestReport coveralls
diff --git a/gradle/coveralls.gradle b/gradle/coveralls.gradle
index b23e007..438881c 100644
--- a/gradle/coveralls.gradle
+++ b/gradle/coveralls.gradle
@@ -11,16 +11,12 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports', dependsOn:
   additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
   sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
   classDirectories = files(subprojects.sourceSets.main.output)
-  executionData = files(subprojects.jacocoTestReport.executionData)
+  executionData = files(subprojects.jacocoTestReport.executionData).filter { it.exists() }
 
   reports {
     html.enabled = true
     xml.enabled = true
   }
-
-  doFirst {
-    executionData = files(executionData.findAll { it.exists() })
-  }
 }
 
 coveralls {