From 3b0a21b9b1331cb967eebb114bfb777d05d50fd7 Mon Sep 17 00:00:00 2001
From: Robert Kruszewski <robert@robert.sx>
Date: Sun, 18 Jun 2017 13:16:49 -0400
Subject: [PATCH] correct checkstyle configuration directory (#188)

---
 .../resources/checkstyle/checkstyle.xml                        | 2 +-
 .../com/palantir/baseline/plugins/BaselineCheckstyle.groovy    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
index 932fe8d6b..28e9bfa62 100644
--- a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
+++ b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
@@ -40,7 +40,7 @@
         <property name="message" value="Whitespace at end-of-line"/>
     </module>
     <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
-        <property name="file" value="${samedir}/checkstyle-suppressions.xml"/>
+        <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
     </module>
     <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
     <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.groovy b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.groovy
index 2d0e48b26..fbcd3f032 100644
--- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.groovy
+++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.groovy
@@ -54,9 +54,10 @@ class BaselineCheckstyle extends AbstractBaselinePlugin {
     def configureCheckstyle() {
         project.logger.debug("Baseline: Configuring Checkstyle tasks")
 
+        def baselineConfigDir = configDir
         // Configure checkstyle
         project.checkstyle {
-            configDir = project.file("${configDir}/checkstyle")
+            configDir = project.file("${baselineConfigDir}/checkstyle")
         }
 
         // Set custom source rules for checkstyleMain task.