From 077c0eea989f3bcbaea08eb24db53a27bf238476 Mon Sep 17 00:00:00 2001
From: Aris Kotsomitopoulos
 <60798129+ariskotsomitopoulos@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:20:20 +0200
Subject: [PATCH] Revert "AGP 7.1.0"

---
 dependencies.gradle                                          | 3 ++-
 dependencies_groups.gradle                                   | 1 -
 matrix-sdk-android/build.gradle                              | 4 ++--
 .../android/sdk/internal/session/sync/job/SyncWorker.kt      | 2 ++
 vector/build.gradle                                          | 5 +++--
 vector/lint.xml                                              | 1 -
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 620b252cd1..77d072e7c7 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,7 +7,7 @@ ext.versions = [
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.1.0"
+def gradle = "7.0.4"
 // Ref: https://kotlinlang.org/releases.html
 def kotlin = "1.5.31"
 def kotlinCoroutines = "1.5.2"
@@ -37,6 +37,7 @@ ext.libs = [
                 'gradlePlugin'            : "com.android.tools.build:gradle:$gradle",
                 'kotlinPlugin'            : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin",
                 'hiltPlugin'              : "com.google.dagger:hilt-android-gradle-plugin:$dagger"
+
         ],
         jetbrains   : [
                 'coroutinesCore'          : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index e8bc2484d2..7de8100469 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -175,7 +175,6 @@ ext.groups = [
                         'org.sonatype.oss',
                         'org.testng',
                         'org.threeten',
-                        'org.webjars',
                         'ru.noties',
                         'xerces',
                         'xml-apis',
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 5137d18c00..e1877d5f71 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -64,8 +64,8 @@ android {
         }
     }
 
-    installation {
-        installOptions '-g'
+    adbOptions {
+        installOptions "-g"
 //        timeOutInMs 350 * 1000
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index c67c0e350e..423a4e553f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.SessionComponent
 import org.matrix.android.sdk.internal.session.sync.SyncPresence
 import org.matrix.android.sdk.internal.session.sync.SyncTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
@@ -57,6 +58,7 @@ internal class SyncWorker(context: Context, workerParameters: WorkerParameters,
     ) : SessionWorkerParams
 
     @Inject lateinit var syncTask: SyncTask
+    @Inject lateinit var taskExecutor: TaskExecutor
     @Inject lateinit var workManagerProvider: WorkManagerProvider
 
     override fun injectWith(injector: SessionComponent) {
diff --git a/vector/build.gradle b/vector/build.gradle
index e533327b82..c6a2636acf 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -291,8 +291,9 @@ android {
         }
     }
 
-    lint {
-        lintConfig file('lint.xml')
+    lintOptions {
+        lintConfig file("lint.xml")
+
         checkDependencies true
         abortOnError true
     }
diff --git a/vector/lint.xml b/vector/lint.xml
index f2387c58cb..f02090489c 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -6,7 +6,6 @@
     <issue id="MissingTranslation" severity="ignore" />
     <issue id="TypographyEllipsis" severity="error" />
     <issue id="ImpliedQuantity" severity="warning" />
-    <issue id="MissingQuantity" severity="warning" />
     <issue id="UnusedQuantity" severity="error" />
     <issue id="IconXmlAndPng" severity="error" />
     <issue id="IconDipSize" severity="error" />