Fix the checkstyle config to not break other modules

rtaylor205 · Jul 24, 2016 · c7e4b65 · c7e4b65
1 parent 5a7fcc4
commit c7e4b65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
-}
+}
diff --git 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>
+</module>