From 4a3e4bd9db85f317af327f1151683566928132d8 Mon Sep 17 00:00:00 2001 From: AustinBenoit Date: Tue, 30 Jun 2026 11:56:15 -0400 Subject: [PATCH] Upgrade JUnit 4 to 4.13.2 to resolve CVE-2020-15250 Upgraded 'androidx.test.ext:junit' from '1.1.1' to '1.1.5', which transitively pulls in the patched 'junit:junit:4.13.2'. Note: We chose '1.1.5' over newer versions (like '1.3.0') to avoid dependency conflicts with the project's older Kotlin (1.3.72) and Gradle (7.4.2) configurations. --- .../integration_testing/gameloop_android/app/build.gradle | 4 +++- scripts/gha/ui_testing/uitest_android/app/build.gradle | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/gha/integration_testing/gameloop_android/app/build.gradle b/scripts/gha/integration_testing/gameloop_android/app/build.gradle index 7ca0c31d84..447a8dcb27 100644 --- a/scripts/gha/integration_testing/gameloop_android/app/build.gradle +++ b/scripts/gha/integration_testing/gameloop_android/app/build.gradle @@ -29,7 +29,9 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + // 1.1.5 is used instead of newer versions (e.g. 1.3.0) to maintain compatibility + // with the project's older Kotlin (1.3.72) and Gradle (7.4.2) versions. + androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' } diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle index 09cb0601ce..38ad56db40 100644 --- a/scripts/gha/ui_testing/uitest_android/app/build.gradle +++ b/scripts/gha/ui_testing/uitest_android/app/build.gradle @@ -40,8 +40,10 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation 'androidx.appcompat:appcompat:1.1.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + testImplementation 'junit:junit:4.13.2' + // 1.1.5 is used instead of newer versions (e.g. 1.3.0) to maintain compatibility + // with the project's older Kotlin and Gradle versions. + androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion androidTestImplementation 'androidx.test.uiautomator:uiautomator:' + rootProject.uiautomatorVersion