Merge branch 'master' of https://github.com/DMDirc/Meta

.idea/inspectionProfiles/Project_Default.xml

@@ -254,7 +254,7 @@
       <option name="onlyWarnOnLoop" value="true" />
     </inspection_tool>
     <inspection_tool class="SubstringZero" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SuppressionAnnotation" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="SuppressionAnnotation" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SynchronizationOnStaticField" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SynchronizeOnLock" enabled="true" level="WARNING" enabled_by_default="true" />

README.md

@@ -85,17 +85,17 @@ make sure everything actually still works!
 
 You can see an overview of open pull requests across all of the DMDirc projects [here](https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Admdirc).
 
-### Continuous Integration
+### Continuous Integration and Code Coverage
 
-The current CI status for the major projects are shown below:
+The current CI and coverage status for the major projects are shown below:
 
-| Project | Status                                                              |
-|---------|---------------------------------------------------------------------|
-| Meta    | [![Circle CI](https://circleci.com/gh/DMDirc/Meta.png?style=badge)](https://circleci.com/gh/DMDirc/Meta) |
-| Client  | [![Circle CI](https://circleci.com/gh/DMDirc/DMDirc.png?style=badge)](https://circleci.com/gh/DMDirc/DMDirc) |
-| Parser  | [![Circle CI](https://circleci.com/gh/DMDirc/Parser.png?style=badge)](https://circleci.com/gh/DMDirc/Parser) |
-| Plugins | [![Circle CI](https://circleci.com/gh/DMDirc/Plugins.png?style=badge)](https://circleci.com/gh/DMDirc/Plugins) |
-| Util    | [![Circle CI](https://circleci.com/gh/DMDirc/Util.png?style=badge)](https://circleci.com/gh/DMDirc/Util) |
+| Project | Status | Coverage |
+|:-------:|:------:|:--------:|
+| Meta    | [![Circle CI](https://circleci.com/gh/DMDirc/Meta.png?style=badge)](https://circleci.com/gh/DMDirc/Meta) | (No code) |
+| Client  | [![Circle CI](https://circleci.com/gh/DMDirc/DMDirc.png?style=badge)](https://circleci.com/gh/DMDirc/DMDirc)  | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/DMDirc.svg)](https://coveralls.io/r/DMDirc/DMDirc?branch=master) |
+| Parser  | [![Circle CI](https://circleci.com/gh/DMDirc/Parser.png?style=badge)](https://circleci.com/gh/DMDirc/Parser)  | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/Parser.svg)](https://coveralls.io/r/DMDirc/Parser?branch=master) |
+| Plugins | [![Circle CI](https://circleci.com/gh/DMDirc/Plugins.png?style=badge)](https://circleci.com/gh/DMDirc/Plugins) | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/Plugins.svg)](https://coveralls.io/r/DMDirc/Plugins?branch=master) |
+| Util    | [![Circle CI](https://circleci.com/gh/DMDirc/Util.png?style=badge)](https://circleci.com/gh/DMDirc/Util) | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/Util.svg)](https://coveralls.io/r/DMDirc/Util?branch=master) |
 
 ### Issues
 

build.gradle

@@ -1,20 +1,13 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath group: 'org.gradle.api.plugins', name: 'gradle-clover-plugin', version: '0.8.2'
-    }
+plugins {
+    id 'com.bmuschko.clover' version '2.0.1'
 }
 
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+apply from: 'gradle/clover.gradle'
+apply from: 'gradle/local-dependency-change.gradle'
+apply from: 'gradle/javadoc.gradle'
 
-apply from: 'clover.gradle'
-apply from: 'local-dependency-change.gradle'
-apply from: 'javadoc.gradle'
+subprojects.each { evaluationDependsOn it.path }
+tasks.dependencies.dependsOn subprojects*.tasks.dependencies
 
 task createWrapper(type: Wrapper) {
     description 'Downloads and installs an up-to-date wrapper for gradle.'

circle.yml

@@ -5,7 +5,7 @@ machine:
     version: oraclejdk8
   environment:
     TERM: dumb
-    GRADLE_OPTS: -Xmx3g
+    GRADLE_OPTS: -Xmx2g
 
 checkout:
   post:
@@ -21,7 +21,7 @@ test:
   override:
     - >
       if [ -n "${BUILD_JAVADOC}" ]; then
-        ./gradlew --stacktrace packageJavadoc;
+        ./gradlew --stacktrace util:javadocJar packageJavadoc;
       elif [ -n "${BUILD_PMD}" ]; then
         ./gradlew --stacktrace pmdMain;
       else

clover.gradle → gradle/clover.gradle

@@ -9,7 +9,7 @@ task checkCloverCredentials << {
 }
 
 allprojects {
-    apply plugin: 'clover'
+    apply plugin: 'com.bmuschko.clover'
 
     clover {
         includeTasks = Boolean.valueOf(rootProject.enableClover) ? [] : ['none']
@@ -24,10 +24,9 @@ allprojects {
     repositories.mavenCentral()
 
     dependencies {
-        clover group: 'com.atlassian.clover', name: 'clover', version: '4.0.0'
+        clover group: 'com.atlassian.clover', name: 'clover', version: '4.0.2'
     }
 
     cloverGenerateReport.dependsOn ':checkCloverCredentials'
-
 }