From fd30437c9403c2415633a3243f466b8adb4ae9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf=20Montwe=CC=81?= <wolf@thunderbird.net>
Date: Mon, 20 Mar 2023 11:24:49 +0100
Subject: [PATCH] Remove truth library and remaining usage

---
 app/k9mail/build.gradle.kts                                   | 2 --
 .../com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt | 4 +++-
 gradle/libs.versions.toml                                     | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/k9mail/build.gradle.kts b/app/k9mail/build.gradle.kts
index d3a25f8871..47f672dc52 100644
--- a/app/k9mail/build.gradle.kts
+++ b/app/k9mail/build.gradle.kts
@@ -32,8 +32,6 @@ dependencies {
         debugImplementation(libs.leakcanary.android)
     }
 
-    testImplementation(libs.bundles.shared.jvm.test.legacy)
-
     // Required for DependencyInjectionTest to be able to resolve OpenPgpApiManager
     testImplementation(projects.plugins.openpgpApiLib.openpgpApi)
 
diff --git a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
index 9ea0d37bb8..e7a463567d 100644
--- a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
+++ b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
@@ -1,6 +1,9 @@
 package com.fsck.k9.widget.unread
 
 import android.content.Context
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNull
 import com.fsck.k9.Account
 import com.fsck.k9.AppRobolectricTest
 import com.fsck.k9.Preferences
@@ -12,7 +15,6 @@ import com.fsck.k9.mailstore.FolderType
 import com.fsck.k9.search.SearchAccount
 import com.fsck.k9.ui.folders.FolderNameFormatter
 import com.fsck.k9.ui.messagelist.DefaultFolderProvider
-import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 389452d759..4f6ff846b4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -132,7 +132,6 @@ robolectric = "org.robolectric:robolectric:4.9.2"
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
 mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0"
-truth = "com.google.truth:truth:1.1.3"
 turbine = "app.cash.turbine:turbine:0.12.1"
 jdom2 = "org.jdom:jdom2:2.0.6.1"
 icu4j-charset = "com.ibm.icu:icu4j-charset:72.1"
@@ -176,6 +175,3 @@ shared-jvm-test-compose = [
   "androidx-compose-ui-test-junit4",
   "androidx-test-espresso-core",
 ]
-shared-jvm-test-legacy = [
-  "truth",
-]
-- 
GitLab