From 21af60f4de45690c15e29985fdac092b7280b645 Mon Sep 17 00:00:00 2001 From: David Perez Date: Fri, 21 Mar 2025 11:11:12 -0500 Subject: [PATCH] Update to Junit 5.12.1 (#4903) --- app/build.gradle.kts | 2 ++ authenticator/build.gradle.kts | 2 ++ authenticatorbridge/build.gradle.kts | 2 ++ gradle/libs.versions.toml | 8 +++++--- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0d219dfe24..6dd6f9b76a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -271,6 +271,8 @@ dependencies { testImplementation(libs.androidx.compose.ui.test) testImplementation(libs.google.hilt.android.testing) + testImplementation(platform(libs.junit.bom)) + testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.junit.junit5) testImplementation(libs.junit.vintage) testImplementation(libs.kotlinx.coroutines.test) diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts index 991039518c..cfb2400b50 100644 --- a/authenticator/build.gradle.kts +++ b/authenticator/build.gradle.kts @@ -206,6 +206,8 @@ dependencies { testImplementation(libs.androidx.compose.ui.test) testImplementation(libs.google.hilt.android.testing) + testImplementation(platform(libs.junit.bom)) + testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.junit.junit5) testImplementation(libs.junit.vintage) testImplementation(libs.kotlinx.coroutines.test) diff --git a/authenticatorbridge/build.gradle.kts b/authenticatorbridge/build.gradle.kts index cf4074b7c8..32da3b2683 100644 --- a/authenticatorbridge/build.gradle.kts +++ b/authenticatorbridge/build.gradle.kts @@ -66,6 +66,8 @@ dependencies { implementation(libs.kotlinx.coroutines.core) // Test environment dependencies: + testImplementation(platform(libs.junit.bom)) + testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.junit.junit5) testImplementation(libs.mockk.mockk) testImplementation(libs.square.turbine) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6a19e1f62f..41b0503a74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,7 +42,7 @@ googleProtoBufPlugin = "0.9.4" googleServices = "4.4.2" googleReview = "2.0.2" hilt = "2.55" -junit5 = "5.11.4" +junit5 = "5.12.1" jvmTarget = "17" # kotlin and ksp **must** use compatible versions, do not update either without the other. kotlin = "2.1.10" @@ -115,8 +115,10 @@ 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-junit5 = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" } -junit-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" } +junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" } +junit-junit5 = { 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" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }