From 8af44b1af5a3b35c0b3a7e08834552a2990bf60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 4 Jul 2016 11:25:04 +0100
Subject: [PATCH 1/2] checkstyle: bump to 7.0

Remove LITERAL_DO from the config in RightCurly as we want this:

        do {
            foo;
        } while (bar);

Not this:

        do {
            foo;
        }
        while (bar);

This went unnoticed as LITERAL_DO was broken in RightCurly in earlier
Checkstyle versions.
---
 Privileged-Extension/build.gradle | 2 +-
 app/build.gradle                  | 2 +-
 config/checkstyle/checkstyle.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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..a4a8c9739 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) {
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" />

From 7fe15e6c7dbd502f8780f7b3d8f68239eaf59a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 4 Jul 2016 11:29:35 +0100
Subject: [PATCH 2/2] PMD: bump to 5.5.0

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a4a8c9739..6d92b39a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -221,7 +221,7 @@ task checkstyle(type: Checkstyle) {
 }
 
 pmd {
-    toolVersion = '5.4.2'
+    toolVersion = '5.5.0'
     consoleOutput = true
 }