From 07119f947c23022ca2cea444affdb43a4e8e2293 Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Wed, 18 Mar 2026 00:24:23 +0530 Subject: [PATCH 1/4] android-interop-testing: align AndroidX Test Runner version to 1.7.0 --- android-interop-testing/build.gradle | 2 +- gradle/libs.versions.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index 9d142743431..a47c9c4c78d 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -80,7 +80,7 @@ dependencies { } androidTestImplementation libraries.androidx.test.ext.junit, - 'androidx.test:runner:1.4.0' + libraries.androidx.test.runner } // Checkstyle doesn't run automatically with android diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 039ff63d81c..73c19140478 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,7 @@ androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.7" androidx-test-core = "androidx.test:core:1.7.0" androidx-test-ext-junit = "androidx.test.ext:junit:1.3.0" androidx-test-rules = "androidx.test:rules:1.7.0" +androidx-test-runner = "androidx.test:runner:1.7.0" animalsniffer = "org.codehaus.mojo:animal-sniffer:1.26" animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.26" assertj-core = "org.assertj:assertj-core:3.27.6" From eface9add14c2251cec72e8f3d837f865dfbec48 Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Thu, 19 Mar 2026 12:31:36 +0530 Subject: [PATCH 2/4] android-interop-testing: add AndroidX Test core and rules to androidTestImplementation --- android-interop-testing/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index a47c9c4c78d..106ebc4add0 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -72,6 +72,7 @@ dependencies { libraries.junit, libraries.truth, libraries.androidx.test.rules, + libraries.androidx.test.core, libraries.opencensus.contrib.grpc.metrics implementation (project(':grpc-services')) { @@ -81,6 +82,8 @@ dependencies { androidTestImplementation libraries.androidx.test.ext.junit, libraries.androidx.test.runner + libraries.androidx.test.rules, + libraries.androidx.test.core } // Checkstyle doesn't run automatically with android From e6f422083ace85eff2011e28bf14e4c0ea82ca1b Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Thu, 19 Mar 2026 23:19:12 +0530 Subject: [PATCH 3/4] add comma --- android-interop-testing/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index 106ebc4add0..ad1d3448c16 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -81,7 +81,7 @@ dependencies { } androidTestImplementation libraries.androidx.test.ext.junit, - libraries.androidx.test.runner + libraries.androidx.test.runner, libraries.androidx.test.rules, libraries.androidx.test.core } From 75a94d61f446204798cc47e24b697d45e3529c5d Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Fri, 20 Mar 2026 00:42:33 +0530 Subject: [PATCH 4/4] remove rules and core from androidTestImplementation --- android-interop-testing/build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index ad1d3448c16..b61d50a6763 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -81,9 +81,7 @@ dependencies { } androidTestImplementation libraries.androidx.test.ext.junit, - libraries.androidx.test.runner, - libraries.androidx.test.rules, - libraries.androidx.test.core + libraries.androidx.test.runner } // Checkstyle doesn't run automatically with android