Remove Mockito dependency from project

signalapp · Dec 12, 2024 · 6a7284e · 6a7284e
1 parent 542374a
commit 6a7284e
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 59 deletions.
diff --git 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
@@ -7,7 +7,6 @@
 -dontwarn sun.misc.**
 -dontwarn org.assertj.**
 -dontwarn org.hamcrest.**
--dontwarn org.mockito.**
 -dontwarn com.squareup.**
 
 -dontobfuscate
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2879,9 +2879,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
          </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2" version="8.4.1-11315950">
-         <artifact name="aapt2-8.4.1-11315950-linux.jar">
-            <sha256 value="0436553853f613304254a570e67e24951da0b70d34e0594975a1d7df1e7af4a0" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="aapt2-8.4.1-11315950-osx.jar">
             <sha256 value="57c0267a21c00801cf315a42c10d56fb4b56cad54da262ba52d3e34578f21226" origin="Generated by Gradle"/>
          </artifact>
@@ -3937,11 +3934,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.googlecode.libphonenumber" name="libphonenumber" version="8.13.40">
-         <artifact name="libphonenumber-8.13.40.jar">
-            <sha256 value="397eeb53b568b4ff98a60e52fca50fe75bbfc1ffdd972fbe4d745bb7c66bf065" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.googlecode.libphonenumber" name="libphonenumber" version="8.13.50">
          <artifact name="libphonenumber-8.13.50.jar">
             <sha256 value="61d7ec7de6ecf6f1cf3c22b595b358c8fbe32a7b104b5b356258902bb0e914db" origin="Generated by Gradle"/>
@@ -4950,11 +4942,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5e8606d14a844c1ec70d2eb8f50c4009fb16138905dee8ca50a328116c041257" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy-android" version="1.12.10">
-         <artifact name="byte-buddy-android-1.12.10.jar">
-            <sha256 value="5e2c0b2ddb02e51fe95e4a58052fc7af91e566b627fe52f4e15699baa1f686d7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="net.java.dev.jna" name="jna" version="5.6.0">
          <artifact name="jna-5.6.0.jar">
             <sha256 value="5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf" origin="Generated by Gradle"/>
@@ -5937,26 +5924,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="abeaf34795a4de70f72aed6de5966d2955ec7eb348eeb813324f23c999575473" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit" name="junit-bom" version="5.8.1">
-         <artifact name="junit-bom-5.8.1.module">
-            <sha256 value="6b82cba52a134b13c1982f0cf9622c6d485371d40b989246f3124e3b0a5b1854" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit" name="junit-bom" version="5.8.2">
          <artifact name="junit-bom-5.8.2.module">
             <sha256 value="40cfad993fa70ecdf2af74d0c56da1484ee220964be8f932cfe632be9a2733fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit" name="junit-bom" version="5.9.2">
-         <artifact name="junit-bom-5.9.2.module">
-            <sha256 value="ab137ba5a8e32c9b066bf9126a1c76dd5614b724ba5c0b02549772b5e9f4cf1f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit" name="junit-bom" version="5.9.3">
-         <artifact name="junit-bom-5.9.3.module">
-            <sha256 value="b401fd25901e582a524aa5343c4b39e28bc56e24961c1069bf2b4bbfcee46b93" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit.jupiter" name="junit-jupiter" version="5.8.2">
          <artifact name="junit-jupiter-5.8.2.jar">
             <sha256 value="4f5c1cc6432244cd16e36aa0e02b74bce34a81ff95a13d63d50951ec4ce3f4bd" origin="Generated by Gradle"/>
@@ -6010,21 +5982,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="20522549056e9e50aa35ef0b445a2e47a53d06be0b0a9467d704e2483ffb049a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.mockito" name="mockito-core" version="4.6.1">
-         <artifact name="mockito-core-4.6.1.jar">
-            <sha256 value="ee3b91cdf4c23cff92960c32364371c683ee6415f1ec4678317bcea79c9f9819" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.mockito" name="mockito-inline" version="4.6.1">
-         <artifact name="mockito-inline-4.6.1.jar">
-            <sha256 value="ee52e1c299a632184fba274a9370993e09140429f5e516e6c5570fd6574b297f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.mockito.kotlin" name="mockito-kotlin" version="4.0.0">
-         <artifact name="mockito-kotlin-4.0.0.jar">
-            <sha256 value="046eabba9c38816f75114163ac5074630f335dcdeeac52f228ce71c732c3d75f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.mozilla" name="rhino" version="1.7.7">
          <artifact name="rhino-1.7.7.jar">
             <sha256 value="73b8d6bbbd1a6a3a87ea0eea301996deac83f8d40b404518a10afd4d320b5b31" origin="Generated by Gradle"/>

diff --git 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)