diff --git a/app/build.gradle b/app/build.gradle
index a97ee8398..b32149ce5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -231,14 +231,16 @@ pmd {
     consoleOutput = true
 }
 
-task pmdMain(type: Pmd, dependsOn: assembleDebug) {
+task pmdMain(type: Pmd) {
+    dependsOn 'assembleDebug'
     ruleSetFiles = files("${project.rootDir}/config/pmd/rules.xml", "${project.rootDir}/config/pmd/rules-main.xml")
     ruleSets = [] // otherwise defaults clash with the list in rules.xml
     source 'src/main/java'
     include '**/*.java'
 }
 
-task pmdTest(type: Pmd, dependsOn: assembleDebug) {
+task pmdTest(type: Pmd) {
+    dependsOn 'assembleDebug'
     ruleSetFiles = files("${project.rootDir}/config/pmd/rules.xml", "${project.rootDir}/config/pmd/rules-test.xml")
     ruleSets = [] // otherwise defaults clash with the list in rules.xml
     source 'src/test/java', 'src/androidTest/java'
diff --git a/build.gradle b/build.gradle
index 49b0130b6..9653f5be2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath files('libs/gradle-witness.jar')
     }
 }