diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index f8b62f135..cfe3d1269 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -36,7 +36,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.19'
+    toolVersion = '7.0'
 }
 
 task checkstyle(type: Checkstyle) {
diff --git a/app/build.gradle b/app/build.gradle
index 6fa5c7227..6d92b39a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -209,7 +209,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.19'
+    toolVersion = '7.0'
 }
 
 task checkstyle(type: Checkstyle) {
@@ -221,7 +221,7 @@ task checkstyle(type: Checkstyle) {
 }
 
 pmd {
-    toolVersion = '5.4.2'
+    toolVersion = '5.5.0'
     consoleOutput = true
 }
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 735e5d608..b38c18289 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -96,7 +96,7 @@
         <module name="RightCurly"/>
         <module name="RightCurly">
             <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
         </module>
 
         <module name="EmptyStatement" />