From b637a576f22bf018d59f4598a432f0b9e8fc1582 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Tue, 6 Jul 2021 18:57:18 +0200
Subject: [PATCH] [fenix] Update to Kotlin 1.5.20, Android Gradle plugin 4.2.2
 and Gradle 6.7.1.

---
 app/build.gradle                         | 4 ++++
 build.gradle                             | 1 +
 buildSrc/src/main/java/Dependencies.kt   | 5 +++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7c7f92591..ce7d6fcbd4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -579,6 +579,10 @@ if (project.hasProperty("coverage")) {
         jacoco.includeNoLocationClasses = true
     }
 
+    jacoco {
+        toolVersion = "0.8.7"
+    }
+
     android.applicationVariants.all { variant ->
         tasks.register("jacoco${variant.name.capitalize()}TestReport", JacocoReport) {
             dependsOn "test${variant.name.capitalize()}UnitTest"
diff --git a/build.gradle b/build.gradle
index f52edd3f83..8b5644fe6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,7 @@ buildscript {
                     includeGroupByRegex RepoMatching.androidx
                     includeGroupByRegex RepoMatching.comGoogleAndroid
                     includeGroupByRegex RepoMatching.comGoogleFirebase
+                    includeGroupByRegex RepoMatching.comGoogleTesting
                     includeGroupByRegex RepoMatching.comAndroid
                 }
             }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 5afab644c4..b9f682b4e0 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -3,12 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object Versions {
-    const val kotlin = "1.5.10"
+    const val kotlin = "1.5.20"
     const val coroutines = "1.5.0"
 
     // These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
     // https://github.com/alexjlockwood/android-lint-checks-demo/blob/0245fc027463137b1b4afb97c5295d60dce998b6/dependencies.gradle#L3
-    const val android_gradle_plugin = "4.0.1"
+    const val android_gradle_plugin = "4.2.2"
     const val android_lint_api = "27.0.1"
 
     const val sentry = "1.7.10"
@@ -243,6 +243,7 @@ object RepoMatching {
     const val androidx = "androidx\\..*"
     const val comAndroid = "com\\.android.*"
     const val comGoogleFirebase = "com\\.google\\.firebase"
+    const val comGoogleTesting = "com\\.google\\.testing\\..*"
 
     /**
      * A matcher for com.google.android.* with one exception: the espresso-contrib dependency includes the
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac33e9944a..1f3fdbc528 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-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists