From 8cd974137bc020589409468d1ac9292ea64b0051 Mon Sep 17 00:00:00 2001
From: Martijn Brekhof <m.brekhof@gmail.com>
Date: Tue, 8 Aug 2017 19:44:24 +0200
Subject: [PATCH] Upgraded android gradle plugin to 2.3.3 (#431)

* Added dependency on assembleFullDebug before running unit tests.
     Apparently assembleFullDebugUnitTest does not include
     the sourceset for fullDebug as defined in app/build.gradle
---
 app/build.gradle                         | 11 +++++++++++
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 26c665b..1f2a18e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -161,4 +161,15 @@ afterEvaluate {
             task.dependsOn grantAnimationPermissionDev
         }
     }
+}
+
+/**
+ * Android gradle plugin 2.3.x contains a bug where the assets for fullDebug
+ * are not copied. The task assembleFullDebug does copy the required assets,
+ * so this dependency fixes the issue.
+ */
+tasks.whenTaskAdded { task ->
+    if (task.name.contains("testFullDebugUnitTest")) {
+        task.dependsOn assembleFullDebug
+    }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d14039d..5966013 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa05f1e..b6c2c4c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 24 16:59:02 CEST 2016
+#Fri Aug 04 21:29:21 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip