From 0c9666b733ef16e1c250d59773120d2635318e5f Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sat, 30 Oct 2021 11:23:51 +0200
Subject: [PATCH] Upgrade Android checkstyle to 9.0.1

Adapt checkstyle.xml to match the latest version, and remove a line
break between imports which trigger a checkstyle volation.
---
 config/android-checkstyle.gradle              |  2 +-
 config/checkstyle/checkstyle.xml              | 35 +++++--------------
 .../scrcpy/ControlMessageReaderTest.java      |  1 -
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/config/android-checkstyle.gradle b/config/android-checkstyle.gradle
index f998530e..29c67b19 100644
--- a/config/android-checkstyle.gradle
+++ b/config/android-checkstyle.gradle
@@ -2,7 +2,7 @@ apply plugin: 'checkstyle'
 check.dependsOn 'checkstyle'
 
 checkstyle {
-    toolVersion = '6.19'
+    toolVersion = '9.0.1'
 }
 
 task checkstyle(type: Checkstyle) {
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 812d060b..edda3919 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -37,6 +37,14 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
   <module name="SuppressWarningsFilter"/>
 
+  <module name="LineLength">
+    <!-- what is a good max value? -->
+    <property name="max" value="150" />
+    <!-- ignore lines like "$File: //depot/... $" -->
+    <property name="ignorePattern" value="\$File.*\$" />
+    <property name="severity" value="info" />
+  </module>
+
   <module name="TreeWalker">
 
     <!-- Checks for Naming Conventions.                  -->
@@ -72,13 +80,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
     <!-- Checks for Size Violations.                    -->
     <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="LineLength">
-      <!-- what is a good max value? -->
-      <property name="max" value="150" />
-      <!-- ignore lines like "$File: //depot/... $" -->
-      <property name="ignorePattern" value="\$File.*\$" />
-      <property name="severity" value="info" />
-    </module>
     <module name="MethodLength" />
     <module name="ParameterNumber">
       <property name="ignoreOverriddenMethods" value="true"/>
@@ -152,26 +153,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
     </module>
     <module name="UpperEll" />
 
-    <module name="FileContentsHolder" />
-    <!-- Required by comment suppression filters -->
-
-  </module>
-
-  <module name="SuppressionFilter">
-    <!--<property name="file" value="team-props/checkstyle/checkstyle-suppressions.xml" />-->
-  </module>
-
-  <!-- Enable suppression comments -->
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE IGNORE\s+(\S+)" />
-    <property name="onCommentFormat" value="CHECKSTYLE END IGNORE\s+(\S+)" />
-    <property name="checkFormat" value="$1" />
-  </module>
-  <module name="SuppressWithNearbyCommentFilter">
-    <!-- Syntax is "SUPPRESS CHECKSTYLE name" -->
-    <property name="commentFormat" value="SUPPRESS CHECKSTYLE (\w+)" />
-    <property name="checkFormat" value="$1" />
-    <property name="influenceFormat" value="1" />
   </module>
 
 </module>
diff --git a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
index da568486..7f3d3f61 100644
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy;
 
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-
 import org.junit.Assert;
 import org.junit.Test;