Add support for sending coverage to codacy.

api/build.gradle

@@ -16,19 +16,20 @@
  */
 
 plugins {
-  id 'java'
-  id 'findbugs'
-  id 'pmd'
-  id 'idea'
+    id 'java'
+    id 'jacoco'
+    id 'findbugs'
+    id 'pmd'
+    id 'idea'
 }
 
 group = 'com.dmdirc'
 
 idea {
     module {
-         sourceDirs += file('src/main/generated')
-         testSourceDirs += file('src/test/generated_tests')
-         generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
+        sourceDirs += file('src/main/generated')
+        testSourceDirs += file('src/test/generated_tests')
+        generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
     }
 }
 
@@ -42,9 +43,9 @@ dependencies {
     compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.5'
     compile group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
 
-    compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
+    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
     compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.5'
-    compile group: 'com.google.guava', name:'guava', version: '19.0'
+    compile group: 'com.google.guava', name: 'guava', version: '19.0'
     compile group: 'com.dmdirc', name: 'com.dmdirc.config.binding', version: '+', changing: true
     compile group: 'com.dmdirc', name: 'com.dmdirc.config.provider', version: '+', changing: true
     compile group: 'com.dmdirc', name: 'com.dmdirc.events.eventbus', version: '+', changing: true
@@ -62,8 +63,7 @@ repositories {
     mavenCentral()
     maven { url 'https://artifactory.dmdirc.com/artifactory/repo' }
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+    maven { url 'http://dl.bintray.com/typesafe/maven-releases' }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.13'
-}
+apply from: '../gradle/analysis.gradle'

api/src/test/java/com/dmdirc/DummyTest.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Our build system likes at least one test per project...
+ */
+public class DummyTest {
+
+    @Test
+    public void testNothing() {
+        assertTrue(true);
+    }
+
+}

build.gradle

@@ -1,10 +1,26 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 plugins {
   id 'com.dmdirc.git-version' version '1.0'
   id 'com.github.kt3k.coveralls' version '2.6.3'
   id 'maven-publish'
   id 'java'
   id 'findbugs'
-  id 'pmd'
   id 'idea'
 }
 
@@ -68,9 +84,11 @@ repositories {
     mavenCentral()
     maven { url 'https://artifactory.dmdirc.com/artifactory/repo' }
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+    maven { url 'http://dl.bintray.com/typesafe/maven-releases' }
 }
 
 apply from: 'gradle/analysis.gradle'
+apply from: 'gradle/codacy.gradle'
 apply from: 'gradle/publishing.gradle'
 apply from: 'gradle/jar.gradle'
 apply from: 'gradle/fatjar.gradle'

bundles/com.dmdirc.config.binding/build.gradle

@@ -17,6 +17,7 @@
 
 plugins {
     id 'java'
+    id 'jacoco'
     id 'findbugs'
     id 'pmd'
     id 'idea'
@@ -51,5 +52,7 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    maven { url 'http://dl.bintray.com/typesafe/maven-releases' }
 }
 
+apply from: '../../gradle/analysis.gradle'

bundles/com.dmdirc.config.binding/src/test/java/com/dmdirc/DummyTest.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Our build system likes at least one test per project...
+ */
+public class DummyTest {
+
+    @Test
+    public void testNothing() {
+        assertTrue(true);
+    }
+
+}

bundles/com.dmdirc.config.provider/build.gradle

@@ -17,6 +17,7 @@
 
 plugins {
     id 'java'
+    id 'jacoco'
     id 'findbugs'
     id 'pmd'
     id 'idea'
@@ -54,5 +55,8 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    maven { url 'http://dl.bintray.com/typesafe/maven-releases' }
 }
 
+apply from: '../../gradle/analysis.gradle'
+

bundles/com.dmdirc.events.eventbus/build.gradle

@@ -17,6 +17,7 @@
 
 plugins {
     id 'java'
+    id 'jacoco'
     id 'findbugs'
     id 'pmd'
     id 'idea'
@@ -51,5 +52,8 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    maven { url 'http://dl.bintray.com/typesafe/maven-releases' }
 }
 
+apply from: '../../gradle/analysis.gradle'
+

bundles/com.dmdirc.events.eventbus/src/test/java/com/dmdirc/DummyTest.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Our build system likes at least one test per project...
+ */
+public class DummyTest {
+
+    @Test
+    public void testNothing() {
+        assertTrue(true);
+    }
+
+}

bundles/com.dmdirc.util.io.yaml/build.gradle

@@ -17,6 +17,7 @@
 
 plugins {
     id 'java'
+    id 'jacoco'
     id 'findbugs'
     id 'pmd'
     id 'idea'
@@ -52,5 +53,8 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    maven { url 'http://dl.bintray.com/typesafe/maven-releases' }
 }
 
+apply from: '../../gradle/analysis.gradle'
+

bundles/com.dmdirc.util.io.yaml/src/test/java/com/dmdirc/DummyTest.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Our build system likes at least one test per project...
+ */
+public class DummyTest {
+
+    @Test
+    public void testNothing() {
+        assertTrue(true);
+    }
+
+}

bundles/com.dmdirc.util.system/build.gradle

@@ -17,6 +17,7 @@
 
 plugins {
     id 'java'
+    id 'jacoco'
     id 'findbugs'
     id 'pmd'
     id 'idea'
@@ -51,5 +52,7 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    maven { url 'http://dl.bintray.com/typesafe/maven-releases' }
 }
 
+apply from: '../../gradle/analysis.gradle'

bundles/com.dmdirc.util.system/src/test/java/com/dmdirc/DummyTest.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Our build system likes at least one test per project...
+ */
+public class DummyTest {
+
+    @Test
+    public void testNothing() {
+        assertTrue(true);
+    }
+
+}

circle.yml

@@ -37,11 +37,11 @@ dependencies:
 
 test:
   override:
-    - ./gradlew --stacktrace --parallel client:jar client:test:
+    - ./gradlew --stacktrace --parallel client:jar client:tests:
         pwd:
           ../meta
   post:
-    - ./gradlew client:jacocoTestReport client:coveralls:
+    - ./gradlew client:sendCoverageToCodacy client:jacocoTestReport client:coveralls:
         pwd:
           ../meta
 

gradle/analysis.gradle

@@ -1,29 +1,31 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+apply plugin: 'pmd'
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 
+configurations {
+    codacy
+}
+
 dependencies {
+    codacy 'com.codacy:codacy-coverage-reporter:1.0.13'
+
     pmd group: 'net.sourceforge.pmd', name: 'pmd-core', version: '5.2.3'
     pmd group: 'net.sourceforge.pmd', name: 'pmd-java', version: '5.2.3'
 }
@@ -48,10 +50,3 @@ findbugs {
     ignoreFailures = true
 }
 
-jacocoTestReport {
-    reports {
-        xml.enabled = true // coveralls plugin depends on xml format report
-        html.enabled = true
-    }
-}
-

gradle/codacy.gradle

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+def javaProjects() {
+    allprojects.findAll { project -> project.plugins.hasPlugin('java') }
+}
+
+FileTree getJacocoClassDirs(Set<Project> projects) {
+    def classDirs = fileTree(dir: "${buildDir}/classes/main")
+    projects.each {
+        classDirs += fileTree(dir: "${it.buildDir}/classes/main")
+    }
+    return classDirs
+}
+
+FileCollection getJacocoSrcDirs(Set<Project> projects) {
+    Set srcDirs = sourceSets.main.java.srcDirs
+    projects.each {
+        srcDirs.add(it.sourceSets.main.java.srcDirs)
+    }
+    return files(srcDirs)
+}
+
+subprojects.each { evaluationDependsOn it.path }
+
+afterEvaluate {
+    task tests(dependsOn: javaProjects()*.test)
+
+    task jacocoMerge(type: JacocoMerge) {
+        javaProjects().each {
+            subproject -> executionData subproject.test
+        }
+    }
+
+    task jacocoCombinedTestReport(type: JacocoReport, dependsOn: jacocoMerge) {
+        classDirectories = getJacocoClassDirs(javaProjects())
+        sourceDirectories = getJacocoSrcDirs(javaProjects())
+        executionData = files("${buildDir}/jacoco/jacocoMerge.exec")
+
+        reports {
+            xml.enabled = true // coveralls plugin depends on xml format report
+            html.enabled = true
+        }
+    }
+
+    task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoCombinedTestReport) {
+        main = "com.codacy.CodacyCoverageReporter"
+        classpath = configurations.codacy
+        args = [
+                "-l",
+                "Java",
+                "-r",
+                "${buildDir}/reports/jacoco/jacocoCombinedTestReport/jacocoCombinedTestReport.xml"
+        ]
+    }
+}

gradle/fatjar.gradle

@@ -1,23 +1,18 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 configurations {

gradle/jar.gradle

@@ -1,23 +1,18 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 task createVersionConfig {

gradle/publishing.gradle

@@ -1,23 +1,18 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 publishing {