Skip to content

Update JUnit and Mockk test dependencies #6005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-livefront merged 1 commit into from
Oct 10, 2025
+18 −18
Merged

Update JUnit and Mockk test dependencies #6005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ dependencies {
testImplementation(libs.google.hilt.android.testing)
testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
Expand Down
2 changes: 1 addition & 1 deletion authenticator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ dependencies {
testImplementation(libs.google.hilt.android.testing)
testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
Expand Down
2 changes: 1 addition & 1 deletion authenticatorbridge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
// Test environment dependencies:
testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testImplementation(libs.mockk.mockk)
testImplementation(libs.square.turbine)
}
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies {

testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
Expand Down
2 changes: 1 addition & 1 deletion cxf/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies {

testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
Expand Down
2 changes: 1 addition & 1 deletion data/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies {

testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ googleProtoBufPlugin = "0.9.5"
googleServices = "4.4.3"
googleReview = "2.0.2"
hilt = "2.57.2"
junit5 = "5.13.4"
junit = "6.0.0"
jvmTarget = "21"
# kotlin and ksp **must** use compatible versions, do not update either without the other.
kotlin = "2.2.20"
Expand All @@ -50,7 +50,7 @@ kotlinxCoroutines = "1.10.2"
kotlinxSerialization = "1.9.0"
kotlinxKover = "0.9.2"
ksp = "2.2.20-2.0.4"
mockk = "1.14.5"
mockk = "1.14.6"
okhttp = "5.1.0"
retrofitBom = "3.0.0"
robolectric = "4.16"
Expand Down Expand Up @@ -112,8 +112,8 @@ google-play-review = { module = "com.google.android.play:review", version.ref =
google-protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "googleProtoBufJava" }
# Included so that Renovate tracks updates since protoc is not referenced directly in `dependency {}` blocks.
google-protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "googleProtoBufJava" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
junit-junit5 = { module = "org.junit.jupiter:junit-jupiter" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
Copy link
Collaborator Author

@david-livefront david-livefront Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calling it JUnit 5 didn't really make sense anymore 😄

junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
junit-vintage = { module = "org.junit.vintage:junit-vintage-engine" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
Expand Down
4 changes: 2 additions & 2 deletions network/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies {

testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk)
Expand All @@ -69,7 +69,7 @@ dependencies {
testFixturesImplementation(project(":core"))
testFixturesImplementation(platform(libs.junit.bom))
testFixturesRuntimeOnly(libs.junit.platform.launcher)
testFixturesImplementation(libs.junit.junit5)
testFixturesImplementation(libs.junit.jupiter)
testFixturesImplementation(libs.junit.vintage)
testFixturesImplementation(libs.kotlinx.serialization)
testFixturesImplementation(libs.square.okhttp)
Expand Down
4 changes: 2 additions & 2 deletions ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dependencies {
debugImplementation(libs.androidx.compose.ui.tooling)

testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.junit5)
testImplementation(libs.junit.jupiter)
testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.vintage)
testImplementation(libs.mockk.mockk)
Expand All @@ -93,7 +93,7 @@ dependencies {
testFixturesImplementation(libs.androidx.navigation.compose)
testFixturesImplementation(libs.google.hilt.android.testing)
testFixturesImplementation(platform(libs.junit.bom))
testFixturesImplementation(libs.junit.junit5)
testFixturesImplementation(libs.junit.jupiter)
testFixturesImplementation(libs.junit.vintage)
testFixturesImplementation(libs.kotlinx.coroutines.test)
testFixturesImplementation(libs.mockk.mockk)
Expand Down
8 changes: 4 additions & 4 deletions ui/src/testFixtures/kotlin/com/bitwarden/ui/platform/base/MainDispatcherExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ class MainDispatcherExtension(
AfterEachCallback,
BeforeAllCallback,
BeforeEachCallback {
override fun afterAll(context: ExtensionContext?) {
override fun afterAll(context: ExtensionContext) {
Dispatchers.resetMain()
}

override fun afterEach(context: ExtensionContext?) {
override fun afterEach(context: ExtensionContext) {
Dispatchers.resetMain()
}

override fun beforeAll(context: ExtensionContext?) {
override fun beforeAll(context: ExtensionContext) {
Dispatchers.setMain(testDispatcher)
}

override fun beforeEach(context: ExtensionContext?) {
override fun beforeEach(context: ExtensionContext) {
Dispatchers.setMain(testDispatcher)
}
}
Loading