From 985308bf0c2ffb0095af8c0e1c818b3ebe130df1 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Mon, 15 Mar 2021 19:21:53 +0100
Subject: [PATCH] Set the whole configDir instead of only configFile for
 checkstyle

---
 app/build.gradle | 2 +-
 checkstyle.xml   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0b8de4d41..3f1803761 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,7 +111,7 @@ configurations {
 }
 
 checkstyle {
-    configFile rootProject.file('checkstyle.xml')
+    configDir rootProject.file(".")
     ignoreFailures false
     showViolations true
     toolVersion = checkstyleVersion
diff --git a/checkstyle.xml b/checkstyle.xml
index af8c5480f..61145d61f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -22,8 +22,7 @@
 
     <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
     <module name="SuppressionFilter">
-        <property name="file" value="${org.checkstyle.sun.suppressionfilter.config}"
-                  default="checkstyle-suppressions.xml" />
+        <property name="file" value="${config_loc}/checkstyle-suppressions.xml" />
         <property name="optional" value="true"/>
     </module>