diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 670f4527fc7..d2494f889c4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -591,8 +591,6 @@ dependencies { testImplementation(testLibs.junit.junit) testImplementation(testLibs.assertj.core) - testImplementation(testLibs.mockito.core) - testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.androidx.test.core) testImplementation(testLibs.robolectric.robolectric) { exclude(group = "com.google.protobuf", module = "protobuf-java") diff --git a/app/proguard/proguard-automation.pro b/app/proguard/proguard-automation.pro index 43561f7b2e1..4c3d66644b6 100644 --- a/app/proguard/proguard-automation.pro +++ b/app/proguard/proguard-automation.pro @@ -7,7 +7,6 @@ -dontwarn sun.misc.** -dontwarn org.assertj.** -dontwarn org.hamcrest.** --dontwarn org.mockito.** -dontwarn com.squareup.** -dontobfuscate \ No newline at end of file diff --git a/app/src/main/res/raw/third_party_licenses b/app/src/main/res/raw/third_party_licenses index 4c395c33e89..31282fce7b2 100644 --- a/app/src/main/res/raw/third_party_licenses +++ b/app/src/main/res/raw/third_party_licenses @@ -353,9 +353,6 @@ The following dependencies are licensed under The MIT License: * ktlint-rule-engine-core (https://github.com/pinterest/ktlint) * ktlint-ruleset-standard (https://github.com/pinterest/ktlint) * maven-dependency-resolver (http://robolectric.org) -* mockito-android (https://github.com/mockito/mockito) -* mockito-core (https://github.com/mockito/mockito) -* mockito-inline (https://github.com/mockito/mockito) * nativeruntime (http://robolectric.org) * pluginapi (http://robolectric.org) * reflector (http://robolectric.org) diff --git a/build-logic/plugins/src/main/java/Licenses.kt b/build-logic/plugins/src/main/java/Licenses.kt index 2ae2a793a0c..7fa17fc00c4 100644 --- a/build-logic/plugins/src/main/java/Licenses.kt +++ b/build-logic/plugins/src/main/java/Licenses.kt @@ -37,8 +37,7 @@ object Licenses { } "https://opensource.org/licenses/MIT", "http://opensource.org/licenses/MIT", - "http://www.opensource.org/licenses/mit-license.php", - "https://github.com/mockito/mockito/blob/main/LICENSE" -> { + "http://www.opensource.org/licenses/mit-license.php" -> { MIT } "http://www.eclipse.org/legal/epl-v10.html" -> { diff --git a/build-logic/plugins/src/main/java/signal-library.gradle.kts b/build-logic/plugins/src/main/java/signal-library.gradle.kts index bc8a3d2dcb9..5d312032a15 100644 --- a/build-logic/plugins/src/main/java/signal-library.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-library.gradle.kts @@ -61,8 +61,6 @@ dependencies { ktlintRuleset(libs.ktlint.twitter.compose) testImplementation(testLibs.junit.junit) - testImplementation(testLibs.mockito.core) - testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.robolectric.robolectric) testImplementation(testLibs.androidx.test.core) testImplementation(testLibs.androidx.test.core.ktx) diff --git a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts index 357d7dd1912..1a9a8b2383b 100644 --- a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts @@ -79,8 +79,6 @@ dependencies { ktlintRuleset(libs.ktlint.twitter.compose) testImplementation(testLibs.junit.junit) - testImplementation(testLibs.mockito.core) - testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.robolectric.robolectric) testImplementation(testLibs.androidx.test.core) testImplementation(testLibs.androidx.test.core.ktx) diff --git a/core-util/build.gradle.kts b/core-util/build.gradle.kts index 4a8011989d4..4c0d731978c 100644 --- a/core-util/build.gradle.kts +++ b/core-util/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { implementation(libs.androidx.documentfile) testImplementation(testLibs.junit.junit) - testImplementation(testLibs.mockito.core) testImplementation(testLibs.robolectric.robolectric) } diff --git a/gradle/test-libs.versions.toml b/gradle/test-libs.versions.toml index cd962e55272..dbf1c4b6606 100644 --- a/gradle/test-libs.versions.toml +++ b/gradle/test-libs.versions.toml @@ -17,8 +17,6 @@ androidx-test-orchestrator = "androidx.test:orchestrator:1.4.1" androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" } espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0" -mockito-core = "org.mockito:mockito-inline:4.6.1" -mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.0.0" robolectric-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } bouncycastle-bcprov-jdk15on = "org.bouncycastle:bcprov-jdk15on:1.70" bouncycastle-bcpkix-jdk15on = "org.bouncycastle:bcpkix-jdk15on:1.70" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dcb14cf613a..c9fef80a1ba 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2879,9 +2879,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - @@ -3937,11 +3934,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -4950,11 +4942,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -5937,26 +5924,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - @@ -6010,21 +5982,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - diff --git a/libsignal-service/build.gradle.kts b/libsignal-service/build.gradle.kts index eb8a1c64175..74a1c6ad846 100644 --- a/libsignal-service/build.gradle.kts +++ b/libsignal-service/build.gradle.kts @@ -103,7 +103,6 @@ dependencies { testImplementation(testLibs.junit.junit) testImplementation(testLibs.assertj.core) testImplementation(testLibs.conscrypt.openjdk.uber) - testImplementation(testLibs.mockito.core) testImplementation(testLibs.mockk) testImplementation(testLibs.hamcrest.hamcrest)