From 81116f2df3da776f4027b8b51ed3f0e31da99e6c Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Mon, 13 Mar 2023 10:18:41 +0100
Subject: [PATCH] Update Robolectric to 4.9.2 (#3422)

---
 app/build.gradle          | 7 +++++++
 gradle/libs.versions.toml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a91cdf8be..7c18396cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -116,6 +116,13 @@ kapt {
     }
 }
 
+configurations {
+    // JNI-only libraries don't play nicely with Robolectric
+    // see https://github.com/tuskyapp/Tusky/pull/3367
+    testImplementation.exclude group: "org.conscrypt", module: "conscrypt-android"
+    testRuntime.exclude group: "org.conscrypt", module: "conscrypt-android"
+}
+
 // library versions are in PROJECT_ROOT/gradle/libs.versions.toml
 dependencies {
     implementation libs.kotlinx.coroutines.android
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 72bb06678..d3a5b20ae 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ mockito-kotlin = "4.1.0"
 networkresult-calladapter = "1.0.0"
 okhttp = "4.10.0"
 retrofit = "2.9.0"
-robolectric = "4.8.1"
+robolectric = "4.9.2"
 rxandroid3 = "3.0.2"
 rxjava3 = "3.1.6"
 rxkotlin3 = "3.0.1"