From 4aff1ab01774fac2e7570b3830175d4e772fb46c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Jan 2022 16:08:47 +0100
Subject: [PATCH 1/4] AGP 7.1.0

---
 dependencies.gradle             | 3 +--
 matrix-sdk-android/build.gradle | 4 ++--
 vector/build.gradle             | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 77d072e7c7..620b252cd1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,7 +7,7 @@ ext.versions = [
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.0.4"
+def gradle = "7.1.0"
 // Ref: https://kotlinlang.org/releases.html
 def kotlin = "1.5.31"
 def kotlinCoroutines = "1.5.2"
@@ -37,7 +37,6 @@ 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/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 57f40d1889..7632de615a 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -62,8 +62,8 @@ android {
         }
     }
 
-    adbOptions {
-        installOptions "-g"
+    installation {
+        installOptions '-g'
 //        timeOutInMs 350 * 1000
     }
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 1c65850a00..a69a095ddb 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -288,9 +288,8 @@ android {
         }
     }
 
-    lintOptions {
-        lintConfig file("lint.xml")
-
+    lint {
+        lintConfig file('lint.xml')
         checkDependencies true
         abortOnError true
     }

From 56e52fd91725c52f3d4237078c95b3229d072f17 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 31 Jan 2022 23:34:56 +0100
Subject: [PATCH 2/4] Whitelist group 'org.webjars' on MavenCentral to fix lint
 execution

---
 dependencies_groups.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index 7de8100469..e8bc2484d2 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -175,6 +175,7 @@ ext.groups = [
                         'org.sonatype.oss',
                         'org.testng',
                         'org.threeten',
+                        'org.webjars',
                         'ru.noties',
                         'xerces',
                         'xml-apis',

From c18a614e72512a9363a56534fe659d4642d457b8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Feb 2022 00:26:10 +0100
Subject: [PATCH 3/4] It seems that now lint rule `MissingQuantity` is an error
 and not a warning by default.

---
 vector/lint.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/lint.xml b/vector/lint.xml
index f02090489c..f2387c58cb 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -6,6 +6,7 @@
     <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" />

From c8ddb2e85eaa66635b3ae0b30fee80a38d6ec976 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 1 Feb 2022 00:30:30 +0100
Subject: [PATCH 4/4] Fix a lint false positive? Anyway this was not used.
 Restricted API
 ../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61:
 ListenableWorker.getTaskExecutor can only be called from within the same
 library group (referenced groupId=androidx.work from groupId=element-android)

---
 .../matrix/android/sdk/internal/session/sync/job/SyncWorker.kt  | 2 --
 1 file changed, 2 deletions(-)

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 423a4e553f..c67c0e350e 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,7 +27,6 @@ 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
@@ -58,7 +57,6 @@ 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) {