Merge remote-tracking branch 'upstream/master' into previewOrder

Author: PaulaRudy

.travis.yml

@@ -19,14 +19,15 @@ addons:
 before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+  - pip install --user codecov
 
 install: ./gradlew :ui:assemble --stacktrace
 
 after_failure: #Run again with debug info enabled
   - ./gradlew check  --stacktrace -PprintTestResults
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash) # Code Coverage Reporting
+  - codecov
   - ./gradlew aggregateJavadocs
   - .travis-scripts/push-javadoc-to-gh-pages.sh
   - .travis-scripts/before-deploy.sh

README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/WPIRoboticsProjects/GRIP.svg?branch=master)](https://travis-ci.org/WPIRoboticsProjects/GRIP)
 [![Build status](https://ci.appveyor.com/api/projects/status/9xl8pggec4l75pqb/branch/master?svg=true)](https://ci.appveyor.com/project/ThomasJClark/grip/branch/master)
 [![codecov.io](http://codecov.io/github/WPIRoboticsProjects/GRIP/coverage.svg?branch=master)](http://codecov.io/github/WPIRoboticsProjects/GRIP?branch=master)
-
+[![Github Releases](https://img.shields.io/github/downloads/WPIRoboticsProjects/GRIP/total.svg)](https://github.com/WPIRoboticsProjects/GRIP/releases/latest)
 
 # GRIP Computer Vision Engine
 

build.gradle

@@ -15,10 +15,10 @@ plugins {
 }
 apply plugin: 'nebula-aggregate-javadocs'
 
-
 allprojects {
     apply plugin: 'java'
     apply plugin: 'application'
+    apply plugin: 'jacoco'
 
 
     repositories {
@@ -31,14 +31,15 @@ allprojects {
         testCompile group: 'junit', name: 'junit', version: '4.12'
     }
 
-    version = '0.1.0'
+    version = '0.2.0'
 
     jacocoTestReport {
         reports {
             xml.enabled = true
             html.enabled = true
         }
     }
+
     check.dependsOn jacocoTestReport
 
     tasks.withType(Javadoc) {
@@ -170,6 +171,30 @@ project(":ui") {
     mainClassName = javafx.mainClass
 }
 
+/*
+ * This is roughly based upon this post:
+ * https://discuss.gradle.org/t/merge-jacoco-coverage-reports-for-multiproject-setups/12100/6
+ */
+task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
+    description = 'Generates an aggregate report from all subprojects'
+    dependsOn(subprojects.test)
+
+    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)
+
+    reports {
+        html.enabled = true
+        xml.enabled = true
+    }
+
+    doFirst {
+        executionData = files(executionData.findAll { it.exists() })
+    }
+}
+check.dependsOn jacocoRootReport
+
 task wrapper(type: Wrapper) {
     gradleVersion = '2.9'
 }