From 378c66c3e86e0dbef3623e8abd9f3ce463e1e1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Wed, 26 Jul 2023 10:42:28 +0200
Subject: [PATCH] Fix tests and warnings

---
 app/build.gradle.kts             | 2 --
 app/src/main/AndroidManifest.xml | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 19bb2ea84b..1c5cb01b95 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,8 +37,6 @@ plugins {
 android {
     namespace = "io.element.android.x"
 
-    testOptions { unitTests.isIncludeAndroidResources = true }
-
     defaultConfig {
         applicationId = "io.element.android.x"
         targetSdk = Versions.targetSdk
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2917c5199b..ffd0265584 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,8 +35,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
+            android:exported="false">
 
             <meta-data
                 android:name='androidx.lifecycle.ProcessLifecycleInitializer'