From f2dce5893d1af2e8422d3bac944ee86708e205e8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 19:53:31 +0000
Subject: [PATCH 1/3] Update android.gradle.plugin to v8.1.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fe9a5aa182..248537b00b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.0.2"
+android_gradle_plugin = "8.1.0"
 kotlin = "1.8.22"
 ksp = "1.8.22-1.0.11"
 molecule = "1.1.0"

From 52cfd93427a632949f67602ead3677530c8f968a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Wed, 26 Jul 2023 07:48:48 +0200
Subject: [PATCH 2/3] Fix plugins

---
 plugins/src/main/kotlin/extension/CommonExtension.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 000aa3264d..6b9523d437 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -23,7 +23,7 @@ import org.gradle.api.Project
 import java.io.File
 import org.gradle.accessors.dm.LibrariesForLibs
 
-fun CommonExtension<*, *, *, *>.androidConfig(project: Project) {
+fun CommonExtension<*, *, *, *, *>.androidConfig(project: Project) {
     defaultConfig {
         compileSdk = Versions.compileSdk
         minSdk = Versions.minSdk
@@ -48,7 +48,7 @@ fun CommonExtension<*, *, *, *>.androidConfig(project: Project) {
     }
 }
 
-fun CommonExtension<*, *, *, *>.composeConfig(libs: LibrariesForLibs) {
+fun CommonExtension<*, *, *, *, *>.composeConfig(libs: LibrariesForLibs) {
 
     buildFeatures {
         compose = true

From 4e3bea08e65a12cceb5de9a56b98c5aed06242ba 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 3/3] 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'