From b7097bc965ad2fa16f5eacd3cdf3014726611a4c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 11:20:09 +0000
Subject: [PATCH 1/3] Update mockito monorepo to v5.24.0

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 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 c7ba78f2ccc1..a18a5efa1664 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -58,7 +58,7 @@ materialIconsCoreVersion = "1.7.8"
 materialVersion = "1.14.0"
 media3 = "1.11.1"
 mockitoKotlinVersion = "6.4.0"
-mockitoVersion = "5.22.0"
+mockitoVersion = "5.24.0"
 mockkVersion = "1.14.11"
 objenesis = "3.5"
 orchestratorVersion = "1.6.1"

From ceaa4ba5746573d8a5db6012f1df956de719d205 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Tue, 20 Oct 2026 10:54:48 +0200
Subject: [PATCH 2/3] fix verification-metadata.xml

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 gradle/verification-metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5e515b486525..3d78279d1556 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -384,6 +384,7 @@
          <trusted-key id="8DF3B0AA23ED78BE5233F6C2DEA3D207428EF16D">
             <trusting group="com.linkedin.dexmaker" name="dexmaker" version="2.28.3"/>
             <trusting group="com.linkedin.dexmaker" name="dexmaker" version="2.28.6"/>
+            <trusting group="com.linkedin.dexmaker" name="dexmaker-mockito-inline" version="2.28.6"/>
          </trusted-key>
          <trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991">
             <trusting group="io.ktor"/>

From a1d9788b38955a879459b7f7fa809ebbc11107c5 Mon Sep 17 00:00:00 2001
From: daniele-verducci <daniele.verducci@nextcloud.com>
Date: Mon, 26 Oct 2026 13:20:37 +0100
Subject: [PATCH 3/3] fix dispatcher.jar

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 app/build.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a89268efe4f3..88ab5b444bc5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -198,6 +198,9 @@ android {
     packaging.resources {
         excludes.addAll(listOf("META-INF/LICENSE*", "META-INF/versions/9/OSGI-INF/MANIFEST*"))
         pickFirsts.add("MANIFEST.MF") // workaround for duplicated manifest on some dependencies
+        // mockito-android (dexmaker-mockito-inline) and mockk-android (mockk-agent-android)
+        // both bundle their own dispatcher.jar for dynamic dex generation; only one is picked
+        pickFirsts.add("dispatcher.jar")
     }
 
     buildFeatures {