From 3338d901a5d2d2d712e724642bb7d58098f7a635 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 14 Jan 2026 11:45:07 -0800 Subject: [PATCH 1/2] Allow gradle testing of a new isolated monitor artifact. It is currently planned to release a new standlone androidx.test.monitor artifact. This change explictly adds monitor to the gradle deps, so this new version can be tested while using the stable released versions of other artifacts. PiperOrigin-RevId: 856301565 --- gradle-tests/espresso/build.gradle | 4 +++- gradle-tests/orchestrator/build.gradle | 1 + gradle-tests/runner/build.gradle | 1 + gradle-tests/settings.gradle | 1 + gradle-tests/settings.gradle.template | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle-tests/espresso/build.gradle b/gradle-tests/espresso/build.gradle index 7a3bfe082..816c82018 100644 --- a/gradle-tests/espresso/build.gradle +++ b/gradle-tests/espresso/build.gradle @@ -49,5 +49,7 @@ dependencies { androidTestImplementation libs.ext.truth androidTestImplementation libs.espresso.core androidTestImplementation libs.espresso.intents - + androidTestImplementation libs.runner + androidTestImplementation libs.monitor + androidTestImplementation libs.core } diff --git a/gradle-tests/orchestrator/build.gradle b/gradle-tests/orchestrator/build.gradle index dce765672..c4f98cf60 100644 --- a/gradle-tests/orchestrator/build.gradle +++ b/gradle-tests/orchestrator/build.gradle @@ -50,6 +50,7 @@ android { dependencies { androidTestImplementation libs.ext.junit androidTestImplementation libs.runner + androidTestImplementation libs.monitor androidTestImplementation libs.ext.truth androidTestUtil libs.orchestrator } diff --git a/gradle-tests/runner/build.gradle b/gradle-tests/runner/build.gradle index 24290ae65..bc65f16ff 100644 --- a/gradle-tests/runner/build.gradle +++ b/gradle-tests/runner/build.gradle @@ -44,5 +44,6 @@ android { dependencies { androidTestImplementation libs.runner + androidTestImplementation libs.monitor } diff --git a/gradle-tests/settings.gradle b/gradle-tests/settings.gradle index 5d35edc42..3f1649165 100644 --- a/gradle-tests/settings.gradle +++ b/gradle-tests/settings.gradle @@ -19,6 +19,7 @@ dependencyResolutionManagement { versionCatalogs { libs { library('core', 'androidx.test:core:1.8.0-alpha01') + library('monitor', 'androidx.test:monitor:1.9.0-alpha01') library('runner', 'androidx.test:runner:1.8.0-alpha01') library('ext.junit', 'androidx.test.ext:junit:1.4.0-alpha01') library('ext.truth', 'androidx.test.ext:truth:1.8.0-alpha01') diff --git a/gradle-tests/settings.gradle.template b/gradle-tests/settings.gradle.template index ee02b12b8..ccb7d4d20 100644 --- a/gradle-tests/settings.gradle.template +++ b/gradle-tests/settings.gradle.template @@ -18,6 +18,7 @@ dependencyResolutionManagement { versionCatalogs { libs { library('core', 'androidx.test:core:{CORE_VERSION}') + library('monitor', 'androidx.test:monitor:{MONITOR_VERSION}') library('runner', 'androidx.test:runner:{RUNNER_VERSION}') library('ext.junit', 'androidx.test.ext:junit:{ANDROIDX_JUNIT_VERSION}') library('ext.truth', 'androidx.test.ext:truth:{ANDROIDX_TRUTH_VERSION}') From 7faa7c80b2378783c0698fda63e9d4321bbf1ce5 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 14 Jan 2026 11:45:07 -0800 Subject: [PATCH 2/2] Update artifacts and version numbers for $DATE release --- BUILD | 24 +----------------------- build_extensions/axt_versions.bzl | 18 +++++++++--------- gradle-tests/settings.gradle | 24 ++++++++++++------------ 3 files changed, 22 insertions(+), 44 deletions(-) diff --git a/BUILD b/BUILD index 2b7a74ea8..b5a29e8c6 100644 --- a/BUILD +++ b/BUILD @@ -23,29 +23,7 @@ define_kt_toolchain( maven_repository( name = "axt_m2repository", testonly = 1, - srcs = [ - "//core/java/androidx/test/core:core_maven_artifact", - "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact", - "//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact", - "//espresso/core/java/androidx/test/espresso:espresso_core_maven_artifact", - "//espresso/device/java/androidx/test/espresso/device:device_maven_artifact", - "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:idling_concurrent_maven_artifact", - "//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_maven_artifact", - "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:idling_net_maven_artifact", - "//espresso/intents/java/androidx/test/espresso/intent:espresso_intents_maven_artifact", - "//espresso/remote/java/androidx/test/espresso/remote:espresso_remote_maven_artifact", - "//espresso/web/java/androidx/test/espresso/web:espresso_web_maven_artifact", - "//ext/junit/java/androidx/test/ext/junit:junit_maven_artifact", - "//ext/truth/java/androidx/test/ext/truth:truth_maven_artifact", - "//ktx/core/java/androidx/test/core:core_maven_artifact", - "//ktx/ext/junit/java/androidx/test/ext/junit:junit_maven_artifact", - "//runner/android_junit_runner/java/androidx/test:runner_maven_artifact", - "//runner/android_test_orchestrator/stubapp:orchestrator_release_maven_artifact", - "//runner/monitor/java/androidx/test:monitor_maven_artifact", - "//runner/rules/java/androidx/test:rules_maven_artifact", - "//services:test_services_maven_artifact", - "//services/storage/java/androidx/test/services/storage:test_storage_maven_artifact", - ], + srcs = ["//runner/monitor/java/androidx/test:monitor_maven_artifact"], ) java_test( diff --git a/build_extensions/axt_versions.bzl b/build_extensions/axt_versions.bzl index 0857ca032..ee3e852b5 100644 --- a/build_extensions/axt_versions.bzl +++ b/build_extensions/axt_versions.bzl @@ -4,16 +4,16 @@ Use tools/release/validate_and_propagate_versions.sh to propagate these versions //:axt_m2_repository and gradle-tests/settings.gradle """ -RUNNER_VERSION = "1.8.0-alpha01" -RULES_VERSION = "1.8.0-alpha01" +RUNNER_VERSION = "1.7.0" +RULES_VERSION = "1.7.0" MONITOR_VERSION = "1.9.0-alpha01" -ESPRESSO_VERSION = "3.8.0-alpha01" -CORE_VERSION = "1.8.0-alpha01" -ESPRESSO_DEVICE_VERSION = "1.2.0-alpha01" -ANDROIDX_JUNIT_VERSION = "1.4.0-alpha01" -ANDROIDX_TRUTH_VERSION = "1.8.0-alpha01" -ORCHESTRATOR_VERSION = "1.7.0-alpha01" -SERVICES_VERSION = "1.7.0-alpha01" +ESPRESSO_VERSION = "3.7.0" +CORE_VERSION = "1.7.0" +ESPRESSO_DEVICE_VERSION = "1.1.0" +ANDROIDX_JUNIT_VERSION = "1.3.0" +ANDROIDX_TRUTH_VERSION = "1.7.0" +ORCHESTRATOR_VERSION = "1.6.1" +SERVICES_VERSION = "1.6.0" # Full maven artifact strings for apks. SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION diff --git a/gradle-tests/settings.gradle b/gradle-tests/settings.gradle index 3f1649165..4a381f7bd 100644 --- a/gradle-tests/settings.gradle +++ b/gradle-tests/settings.gradle @@ -18,19 +18,19 @@ dependencyResolutionManagement { } versionCatalogs { libs { - library('core', 'androidx.test:core:1.8.0-alpha01') + library('core', 'androidx.test:core:1.7.0') library('monitor', 'androidx.test:monitor:1.9.0-alpha01') - library('runner', 'androidx.test:runner:1.8.0-alpha01') - library('ext.junit', 'androidx.test.ext:junit:1.4.0-alpha01') - library('ext.truth', 'androidx.test.ext:truth:1.8.0-alpha01') - library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.8.0-alpha01') - library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.8.0-alpha01') - library('espresso.core', 'androidx.test.espresso:espresso-core:3.8.0-alpha01') - library('espresso.device', 'androidx.test.espresso:espresso-device:1.2.0-alpha01') - library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.8.0-alpha01') - library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.8.0-alpha01') - library('espresso.web', 'androidx.test.espresso:espresso-web:3.8.0-alpha01') - library('orchestrator', 'androidx.test:orchestrator:1.7.0-alpha01') + library('runner', 'androidx.test:runner:1.7.0') + library('ext.junit', 'androidx.test.ext:junit:1.3.0') + library('ext.truth', 'androidx.test.ext:truth:1.7.0') + library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.7.0') + library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.7.0') + library('espresso.core', 'androidx.test.espresso:espresso-core:3.7.0') + library('espresso.device', 'androidx.test.espresso:espresso-device:1.1.0') + library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.7.0') + library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.7.0') + library('espresso.web', 'androidx.test.espresso:espresso-web:3.7.0') + library('orchestrator', 'androidx.test:orchestrator:1.6.1') } }