From 957460f4036b7cd7148bef90a3dffbfda5912d96 Mon Sep 17 00:00:00 2001 From: David Perez Date: Fri, 10 Oct 2025 12:59:42 -0500 Subject: [PATCH] Update JUnit and Mockk test dependencies (#6005) --- app/build.gradle.kts | 2 +- authenticator/build.gradle.kts | 2 +- authenticatorbridge/build.gradle.kts | 2 +- core/build.gradle.kts | 2 +- cxf/build.gradle.kts | 2 +- data/build.gradle.kts | 2 +- gradle/libs.versions.toml | 8 ++++---- network/build.gradle.kts | 4 ++-- ui/build.gradle.kts | 4 ++-- .../bitwarden/ui/platform/base/MainDispatcherExtension.kt | 8 ++++---- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1ea0ed5889..a1a19115f4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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) diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts index 04eef1fcf4..a33a67d912 100644 --- a/authenticator/build.gradle.kts +++ b/authenticator/build.gradle.kts @@ -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) diff --git a/authenticatorbridge/build.gradle.kts b/authenticatorbridge/build.gradle.kts index 3676c253be..20eda47e1f 100644 --- a/authenticatorbridge/build.gradle.kts +++ b/authenticatorbridge/build.gradle.kts @@ -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) } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 990c3b239c..b3127f8726 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -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) diff --git a/cxf/build.gradle.kts b/cxf/build.gradle.kts index b15dd5f390..02b2efab75 100644 --- a/cxf/build.gradle.kts +++ b/cxf/build.gradle.kts @@ -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) diff --git a/data/build.gradle.kts b/data/build.gradle.kts index c3606e5404..ed490c299e 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -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) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b30ede733..985c76c049 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,7 +41,7 @@ googleProtoBufPlugin = "0.9.5" googleServices = "4.4.4" 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" @@ -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" @@ -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" } 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" } diff --git a/network/build.gradle.kts b/network/build.gradle.kts index c905524add..a73bf3b51f 100644 --- a/network/build.gradle.kts +++ b/network/build.gradle.kts @@ -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) @@ -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) diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 16eeffa8d8..1db330ed5d 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -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) @@ -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) diff --git a/ui/src/testFixtures/kotlin/com/bitwarden/ui/platform/base/MainDispatcherExtension.kt b/ui/src/testFixtures/kotlin/com/bitwarden/ui/platform/base/MainDispatcherExtension.kt index e012aa3b53..9c6e188ccb 100644 --- a/ui/src/testFixtures/kotlin/com/bitwarden/ui/platform/base/MainDispatcherExtension.kt +++ b/ui/src/testFixtures/kotlin/com/bitwarden/ui/platform/base/MainDispatcherExtension.kt @@ -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) } }