From c1c7de5c1a655171f48beb4f3ce7ccbf7243a46a Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Wed, 5 Aug 2020 09:17:30 -0700
Subject: [PATCH] For #13262: Update gradle (#13263)

---
 app/build.gradle                         | 15 +++++++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3f86afe6a..0df1ecc6a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -566,7 +566,9 @@ if (project.hasProperty("coverage")) {
     }
 
     android.applicationVariants.all { variant ->
-        task "jacoco${variant.name.capitalize()}TestReport"(type: JacocoReport, dependsOn: "test${variant.name.capitalize()}UnitTest") {
+        tasks.register("jacoco${variant.name.capitalize()}TestReport", JacocoReport) {
+            dependsOn "test${variant.name.capitalize()}UnitTest"
+
             reports {
                 xml.enabled = true
                 html.enabled = true
@@ -579,11 +581,12 @@ if (project.hasProperty("coverage")) {
                     excludes: fileFilter)
             def mainSrc = "$project.projectDir/src/main/java"
 
-            sourceDirectories = files([mainSrc])
-            classDirectories = files([kotlinDebugTree, javaDebugTree])
-            executionData = fileTree(dir: project.buildDir, includes: [
-                    "jacoco/test${variant.name.capitalize()}UnitTest.exec", 'outputs/code-coverage/connected/*coverage.ec'
-            ])
+            sourceDirectories.setFrom(files([mainSrc]))
+            classDirectories.setFrom(files([kotlinDebugTree, javaDebugTree]))
+            executionData.setFrom(fileTree(dir: project.buildDir, includes: [
+                "jacoco/test${variant.name.capitalize()}UnitTest.exec",
+                'outputs/code-coverage/connected/*coverage.ec'
+            ]))
         }
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0ebb3108e..ac33e9944 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists