Merge "Upgrade to androidx.test:runner:1.5.1" into androidx-main
diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle
index 98bfd46..40a7f15 100644
--- a/camera/camera-testing/build.gradle
+++ b/camera/camera-testing/build.gradle
@@ -26,7 +26,10 @@
}
dependencies {
- implementation("androidx.test:core:1.4.0")
+ implementation(libs.testCore)
+ // force runner 1.5.1 so implementation stays consistent with androidTestImplementation
+
+ implementation(libs.testRunner)
implementation(libs.testRules)
implementation(libs.testUiautomator)
api("androidx.annotation:annotation:1.2.0")
@@ -35,8 +38,8 @@
api(project(":camera:camera-core"))
implementation("androidx.core:core:1.1.0")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- implementation("androidx.test.espresso:espresso-core:3.3.0")
- implementation("androidx.test.espresso:espresso-idling-resource:3.1.0")
+ implementation("androidx.test.espresso:espresso-core:3.5.0")
+ implementation("androidx.test.espresso:espresso-idling-resource:3.5.0")
implementation(libs.junit)
implementation(libs.kotlinStdlib)
implementation(libs.kotlinCoroutinesAndroid)
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle
index eb2773a..453701b 100644
--- a/camera/integration-tests/coretestapp/build.gradle
+++ b/camera/integration-tests/coretestapp/build.gradle
@@ -87,6 +87,8 @@
// Testing resource dependency for manifest
debugImplementation(project(":camera:camera-testing"))
debugImplementation(libs.testCore)
+ // explicitly add runner here to force consistency with androidTestImplementation
+ debugImplementation(libs.testRunner)
// Testing framework
androidTestImplementation(libs.testCore)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dda8ef4..4831e6ca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@
androidGradlePluginMin = "7.0.4"
androidLintMin = "30.0.4"
androidLintMinCompose = "30.0.0"
-androidxTestRunner = "1.5.0"
+androidxTestRunner = "1.5.1"
androidxTestRules = "1.5.0"
androidxTestMonitor = "1.6.0"
androidxTestCore = "1.5.0"
