diff --git a/pom.xml b/pom.xml index 751bedd..53eb0d4 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.puppycrawl.tools checkstyle - 6.16.1 + 8.18 diff --git a/src/main/java/io/netty/build/checkstyle/NewlineCheck.java b/src/main/java/io/netty/build/checkstyle/NewlineCheck.java index 8e793be..784b7f1 100644 --- a/src/main/java/io/netty/build/checkstyle/NewlineCheck.java +++ b/src/main/java/io/netty/build/checkstyle/NewlineCheck.java @@ -20,7 +20,6 @@ import com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck; import com.puppycrawl.tools.checkstyle.api.FileText; import java.io.File; -import java.util.List; import java.util.regex.Pattern; public class NewlineCheck extends AbstractFileSetCheck { @@ -57,8 +56,8 @@ public class NewlineCheck extends AbstractFileSetCheck { } @Override - protected void processFiltered(File aFile, List aLines) { - String text = FileText.fromLines(aFile, aLines).getFullText().toString(); + protected void processFiltered(File file, FileText fileText) { + String text = fileText.getFullText().toString(); switch (NEWLINE_TYPE) { case LF: diff --git a/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java b/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java index 74998f1..17e2329 100644 --- a/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java +++ b/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java @@ -17,6 +17,7 @@ package io.netty.build.checkstyle; import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.AutomaticBean; +import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.Filter; import java.util.regex.Pattern; @@ -58,4 +59,9 @@ public class SuppressionFilter extends AutomaticBean implements Filter { } return true; } + + @Override + protected void finishLocalSetup() { + // NOOP. + } }