From 36378acc7b206b30eee7a9a3337cf8554d0a9aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 28 Sep 2016 21:58:27 +0100
Subject: [PATCH] gradle: bump plugin version to 2.2.0

Also update the dependency declarations since the current ones break
with the new plugin/gradle version.

https://stackoverflow.com/questions/39602587/could-not-get-unknown-property-assemblerelease-for-project
---
 app/build.gradle | 6 ++++--
 build.gradle     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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')
     }
 }