From c7e4b65b394333f8da801ae03ee18999c4165052 Mon Sep 17 00:00:00 2001
From: Jasper Abbink <git@abb.ink>
Date: Sun, 24 Jul 2016 13:13:35 +0200
Subject: [PATCH] Fix the checkstyle config to not break other modules

---
 build.gradle          | 7 ++++---
 config/checkstyle.xml | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index feb0dc32..9bdb1f71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,11 +62,12 @@ protobuf {
     }
 }
 
-def checkstyleOutputDir = "${project.rootDir}/build/reports/checkstyle/"
+def checkstyleOutputDir = "${project.projectDir}/build/reports/checkstyle/"
 
 checkstyle {
     toolVersion = '7.0'
-    configFile = file("${project.rootDir}/config/checkstyle.xml")
+    configFile = file("${project.projectDir}/config/checkstyle.xml")
+    configProperties = [ "suppressionFile" : file("${project.projectDir}/config/suppressions.xml")]
     reportsDir = file(checkstyleOutputDir)
 
     ignoreFailures = false
@@ -115,4 +116,4 @@ task sourcesJar(type: Jar) {
 
 artifacts {
     archives sourcesJar
-}
\ No newline at end of file
+}
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 3568be96..d791a10d 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -16,7 +16,7 @@
 
 <module name = "Checker">
     <module name="SuppressionFilter">
-        <property name="file" value="config/suppressions.xml"/>
+        <property name="file" value="${suppressionFile}"/>
     </module>
 
     <property name="charset" value="UTF-8"/>
@@ -204,4 +204,4 @@
         </module>
         <module name="CommentsIndentation"/>
     </module>
-</module>
\ No newline at end of file
+</module>