Skip to content

Commit 5a0c0ad

Browse files
committed
build(deps): remove mockito-core dependency
Now handled properly in mockito-kotlin
1 parent 42cf05a commit 5a0c0ad

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

AnkiDroid/build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -442,14 +442,7 @@ dependencies {
442442
testImplementation libs.junit.jupiter.params
443443
testImplementation libs.junit.vintage.engine
444444
testImplementation libs.mockito.inline
445-
// only needed until mockito-kotlin bumps transitive core dep to
446-
// a version that supports JDK24 (and eventually 25LTS)
447-
testImplementation libs.mockito.core
448-
testImplementation(libs.mockito.kotlin) {
449-
// only needed until mockito-kotlin bumps transitive core dep to
450-
// a version that supports JDK24 (and eventually 25LTS)
451-
exclude module: "mockitoCore"
452-
}
445+
testImplementation libs.mockito.kotlin
453446
testImplementation libs.hamcrest
454447
// robolectricDownloader.gradle *may* need a new SDK jar entry if they release one or if we change targetSdk. Instructions in that gradle file.
455448
testImplementation libs.robolectric

gradle/libs.versions.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,8 @@ lint = '31.13.0'
9494
material = "1.13.0"
9595
materialTapTargetPrompt = "3.3.2"
9696

97-
# Only needed until mockito kotlin updates this transitive itself
98-
mockitoCore = "5.19.0"
9997
mockitoInline = "5.2.0"
100-
mockitoKotlin = "6.1.0" # maybe can remove mockitoCore and its usage with release > 5.4.0
98+
mockitoKotlin = "6.1.0"
10199
mockk = "1.14.6"
102100
nanohttpd = "2.3.1"
103101
okhttp = "5.2.1"
@@ -198,7 +196,6 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
198196
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
199197
kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin" }
200198
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
201-
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
202199
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }
203200
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
204201
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

0 commit comments

Comments
 (0)