From 3249fe9e8cd90e9a28e42df776fd8a0c18df3b4e Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Thu, 25 Jul 2019 06:16:30 +0200
Subject: [PATCH] gradle: checkstyle changes

---
 build.gradle                                  |  2 +
 checkstyle.xml                                | 63 -------------------
 checkstyle/checkstyle.xml                     |  2 +-
 .../suppressions.xml                          |  0
 4 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 checkstyle.xml
 rename suppressions.xml => checkstyle/suppressions.xml (100%)

diff --git a/build.gradle b/build.gradle
index 3b00fb21cb..004882169c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,10 @@ subprojects {
         toolVersion = '6.4.1'
         sourceSets = [sourceSets.main]
         configFile = rootProject.file("./checkstyle/checkstyle.xml")
+        configProperties = [ "suppressionFile" : rootProject.file("./checkstyle/suppressions.xml")]
         showViolations = true
         ignoreFailures = false
+        maxWarnings = 0
     }
 }
 
diff --git a/checkstyle.xml b/checkstyle.xml
deleted file mode 100644
index c1935e18a2..0000000000
--- a/checkstyle.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2017, Adam <Adam@sigterm.info>
- Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<!DOCTYPE module PUBLIC
-	"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-	"https://checkstyle.org/dtds/configuration_1_3.dtd">
-<module name="Checker">
-	<module name="TreeWalker">
-		<module name="LeftCurly">
-			<property name="option" value="nl"/>
-		</module>
-		<module name="RightCurly">
-			<property name="option" value="alone"/>
-		</module>
-		<!-- require tabs for indenting - https://stackoverflow.com/a/28550141 -->
-		<module name="RegexpSinglelineJava">
-			<property name="format" value="^\t* "/>
-			<property name="message" value="Indent must use tab characters"/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="RegexpSinglelineJava">
-			<property name="format" value="import (?!static|java\.awt).*\*"/>
-			<property name="message" value="Multiline imports are disallowed if they are not static"/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="WhitespaceAround"/>
-		<module name="WhitespaceAfter">
-			<property name="tokens" value="COMMA"/>
-		</module>
-		<module name="UnusedImports"/>
-		<module name="SuppressionCommentFilter"/>
-	</module>
-	<module name="RegexpMultiline">
-		<property name="format" value="else[ \t]*[\r\n]+[ \t]*if"/>
-		<property name="message" value="Newline should not be between else and if"/>
-	</module>
-	<module name="SuppressionFilter">
-		<property name="file" value="suppressions.xml"/>
-	</module>
-</module>
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 0a0c65e31e..449e5ab7d9 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -58,6 +58,6 @@
 		<property name="message" value="Newline should not be between else and if"/>
 	</module>
 	<module name="SuppressionFilter">
-		<property name="file" value="suppressions.xml"/>
+		<property name="file" value="${suppressionFile}"/>
 	</module>
 </module>
diff --git a/suppressions.xml b/checkstyle/suppressions.xml
similarity index 100%
rename from suppressions.xml
rename to checkstyle/suppressions.xml