From 51640a61a999a7e2fb3617e7a04324715e62e2e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Sep 2021 08:55:39 +0000
Subject: [PATCH 1/2] Bump work-runtime-ktx from 2.5.0 to 2.6.0

Bumps work-runtime-ktx from 2.5.0 to 2.6.0.

---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index f19c1d3539..a3332a0572 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -49,7 +49,7 @@ ext.libs = [
                 'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.3.6",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.1",
-                'work'                    : "androidx.work:work-runtime-ktx:2.5.0",
+                'work'                    : "androidx.work:work-runtime-ktx:2.6.0",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",
                 'preferenceKtx'           : "androidx.preference:preference-ktx:1.1.1",
                 'junit'                   : "androidx.test.ext:junit:1.1.3",

From 3f7e810f1470103f6c90a3e58b880be9d1d9287f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 30 Sep 2021 12:06:57 +0200
Subject: [PATCH 2/2] Handle change from WorkManager 2.6.0.

https://developer.android.com/jetpack/androidx/releases/work#2.6.0
---
 .../src/androidTest/AndroidManifest.xml              | 11 ++++++++---
 vector/src/main/AndroidManifest.xml                  | 12 +++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/AndroidManifest.xml b/matrix-sdk-android/src/androidTest/AndroidManifest.xml
index 274bd8c87b..40360fcd19 100644
--- a/matrix-sdk-android/src/androidTest/AndroidManifest.xml
+++ b/matrix-sdk-android/src/androidTest/AndroidManifest.xml
@@ -8,10 +8,15 @@
         This is mandatory to run integration tests
         -->
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             android:exported="false"
-            tools:node="remove" />
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
 
     </application>
 
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 6c9453a564..7fd37691ba 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -375,9 +375,15 @@
 
         <!-- Remove WorkManagerInitializer Provider because we are using on-demand initialization of WorkManager-->
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            tools:node="remove" />
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
 
         <provider
             android:name="androidx.core.content.FileProvider"