Skip to content

Commit 894230f

Browse files
jamesonwilliamsgreyson-signal
authored andcommitted
Remove Mockito dependency from project.
Resolves #13838
1 parent 9f18112 commit 894230f

File tree

10 files changed

+1
-41
lines changed

10 files changed

+1
-41
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,6 @@ dependencies {
591591

592592
testImplementation(testLibs.junit.junit)
593593
testImplementation(testLibs.assertj.core)
594-
testImplementation(testLibs.mockito.core)
595-
testImplementation(testLibs.mockito.kotlin)
596594
testImplementation(testLibs.androidx.test.core)
597595
testImplementation(testLibs.robolectric.robolectric) {
598596
exclude(group = "com.google.protobuf", module = "protobuf-java")

app/proguard/proguard-automation.pro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
-dontwarn sun.misc.**
88
-dontwarn org.assertj.**
99
-dontwarn org.hamcrest.**
10-
-dontwarn org.mockito.**
1110
-dontwarn com.squareup.**
1211

1312
-dontobfuscate

app/src/main/res/raw/third_party_licenses

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,6 @@ The following dependencies are licensed under The MIT License:
353353
* ktlint-rule-engine-core (https://github.com/pinterest/ktlint)
354354
* ktlint-ruleset-standard (https://github.com/pinterest/ktlint)
355355
* maven-dependency-resolver (http://robolectric.org)
356-
* mockito-android (https://github.com/mockito/mockito)
357-
* mockito-core (https://github.com/mockito/mockito)
358-
* mockito-inline (https://github.com/mockito/mockito)
359356
* nativeruntime (http://robolectric.org)
360357
* pluginapi (http://robolectric.org)
361358
* reflector (http://robolectric.org)

build-logic/plugins/src/main/java/Licenses.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ object Licenses {
3737
}
3838
"https://opensource.org/licenses/MIT",
3939
"http://opensource.org/licenses/MIT",
40-
"http://www.opensource.org/licenses/mit-license.php",
41-
"https://github.com/mockito/mockito/blob/main/LICENSE" -> {
40+
"http://www.opensource.org/licenses/mit-license.php" -> {
4241
MIT
4342
}
4443
"http://www.eclipse.org/legal/epl-v10.html" -> {

build-logic/plugins/src/main/java/signal-library.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ dependencies {
6161
ktlintRuleset(libs.ktlint.twitter.compose)
6262

6363
testImplementation(testLibs.junit.junit)
64-
testImplementation(testLibs.mockito.core)
65-
testImplementation(testLibs.mockito.kotlin)
6664
testImplementation(testLibs.robolectric.robolectric)
6765
testImplementation(testLibs.androidx.test.core)
6866
testImplementation(testLibs.androidx.test.core.ktx)

build-logic/plugins/src/main/java/signal-sample-app.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ dependencies {
7979
ktlintRuleset(libs.ktlint.twitter.compose)
8080

8181
testImplementation(testLibs.junit.junit)
82-
testImplementation(testLibs.mockito.core)
83-
testImplementation(testLibs.mockito.kotlin)
8482
testImplementation(testLibs.robolectric.robolectric)
8583
testImplementation(testLibs.androidx.test.core)
8684
testImplementation(testLibs.androidx.test.core.ktx)

core-util/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dependencies {
1414
implementation(libs.androidx.documentfile)
1515

1616
testImplementation(testLibs.junit.junit)
17-
testImplementation(testLibs.mockito.core)
1817
testImplementation(testLibs.robolectric.robolectric)
1918
}
2019

gradle/test-libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ androidx-test-orchestrator = "androidx.test:orchestrator:1.4.1"
1717
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
1818
espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
1919
kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0"
20-
mockito-core = "org.mockito:mockito-inline:4.6.1"
21-
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.0.0"
2220
robolectric-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
2321
bouncycastle-bcprov-jdk15on = "org.bouncycastle:bcprov-jdk15on:1.70"
2422
bouncycastle-bcpkix-jdk15on = "org.bouncycastle:bcpkix-jdk15on:1.70"

gradle/verification-metadata.xml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3937,11 +3937,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
39373937
<sha256 value="757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76" origin="Generated by Gradle"/>
39383938
</artifact>
39393939
</component>
3940-
<component group="com.googlecode.libphonenumber" name="libphonenumber" version="8.13.40">
3941-
<artifact name="libphonenumber-8.13.40.jar">
3942-
<sha256 value="397eeb53b568b4ff98a60e52fca50fe75bbfc1ffdd972fbe4d745bb7c66bf065" origin="Generated by Gradle"/>
3943-
</artifact>
3944-
</component>
39453940
<component group="com.googlecode.libphonenumber" name="libphonenumber" version="8.13.50">
39463941
<artifact name="libphonenumber-8.13.50.jar">
39473942
<sha256 value="61d7ec7de6ecf6f1cf3c22b595b358c8fbe32a7b104b5b356258902bb0e914db" origin="Generated by Gradle"/>
@@ -4950,11 +4945,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
49504945
<sha256 value="5e8606d14a844c1ec70d2eb8f50c4009fb16138905dee8ca50a328116c041257" origin="Generated by Gradle"/>
49514946
</artifact>
49524947
</component>
4953-
<component group="net.bytebuddy" name="byte-buddy-android" version="1.12.10">
4954-
<artifact name="byte-buddy-android-1.12.10.jar">
4955-
<sha256 value="5e2c0b2ddb02e51fe95e4a58052fc7af91e566b627fe52f4e15699baa1f686d7" origin="Generated by Gradle"/>
4956-
</artifact>
4957-
</component>
49584948
<component group="net.java.dev.jna" name="jna" version="5.6.0">
49594949
<artifact name="jna-5.6.0.jar">
49604950
<sha256 value="5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf" origin="Generated by Gradle"/>
@@ -6010,21 +6000,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
60106000
<sha256 value="20522549056e9e50aa35ef0b445a2e47a53d06be0b0a9467d704e2483ffb049a" origin="Generated by Gradle"/>
60116001
</artifact>
60126002
</component>
6013-
<component group="org.mockito" name="mockito-core" version="4.6.1">
6014-
<artifact name="mockito-core-4.6.1.jar">
6015-
<sha256 value="ee3b91cdf4c23cff92960c32364371c683ee6415f1ec4678317bcea79c9f9819" origin="Generated by Gradle"/>
6016-
</artifact>
6017-
</component>
6018-
<component group="org.mockito" name="mockito-inline" version="4.6.1">
6019-
<artifact name="mockito-inline-4.6.1.jar">
6020-
<sha256 value="ee52e1c299a632184fba274a9370993e09140429f5e516e6c5570fd6574b297f" origin="Generated by Gradle"/>
6021-
</artifact>
6022-
</component>
6023-
<component group="org.mockito.kotlin" name="mockito-kotlin" version="4.0.0">
6024-
<artifact name="mockito-kotlin-4.0.0.jar">
6025-
<sha256 value="046eabba9c38816f75114163ac5074630f335dcdeeac52f228ce71c732c3d75f" origin="Generated by Gradle"/>
6026-
</artifact>
6027-
</component>
60286003
<component group="org.mozilla" name="rhino" version="1.7.7">
60296004
<artifact name="rhino-1.7.7.jar">
60306005
<sha256 value="73b8d6bbbd1a6a3a87ea0eea301996deac83f8d40b404518a10afd4d320b5b31" origin="Generated by Gradle"/>

libsignal-service/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ dependencies {
103103
testImplementation(testLibs.junit.junit)
104104
testImplementation(testLibs.assertj.core)
105105
testImplementation(testLibs.conscrypt.openjdk.uber)
106-
testImplementation(testLibs.mockito.core)
107106
testImplementation(testLibs.mockk)
108107
testImplementation(testLibs.hamcrest.hamcrest)
109108

0 commit comments

Comments
 (0)