From 65e6fb1f345155eed8ebc7c912c7aefb9bd13146 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 20 Nov 2024 18:33:33 +0000 Subject: [PATCH] Update artifacts and version numbers for 2024_11_20 release --- BUILD | 18 ------------------ build_extensions/axt_versions.bzl | 22 +++++++++------------- gradle-tests/settings.gradle | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 41 deletions(-) diff --git a/BUILD b/BUILD index fa0d874a4..fc042c505 100644 --- a/BUILD +++ b/BUILD @@ -15,25 +15,7 @@ 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", ], diff --git a/build_extensions/axt_versions.bzl b/build_extensions/axt_versions.bzl index b14c37edd..e757622df 100644 --- a/build_extensions/axt_versions.bzl +++ b/build_extensions/axt_versions.bzl @@ -1,17 +1,13 @@ -"""Defines next to be released AXT versions. +"""Defines current released AXT versions.""" -Use tools/release/validate_and_propagate_versions.sh to propagate these versions to -//:axt_m2_repository and gradle-tests/settings.gradle -""" - -RUNNER_VERSION = "1.7.0-alpha01" -RULES_VERSION = "1.7.0-alpha01" -MONITOR_VERSION = "1.8.0-alpha01" -ESPRESSO_VERSION = "3.7.0-alpha01" -CORE_VERSION = "1.7.0-alpha01" -ESPRESSO_DEVICE_VERSION = "1.1.0-alpha01" -ANDROIDX_JUNIT_VERSION = "1.3.0-alpha01" -ANDROIDX_TRUTH_VERSION = "1.7.0-alpha01" +RUNNER_VERSION = "1.6.1" +RULES_VERSION = "1.6.1" +MONITOR_VERSION = "1.7.1" +ESPRESSO_VERSION = "3.6.1" +CORE_VERSION = "1.6.1" +ESPRESSO_DEVICE_VERSION = "1.0.1" +ANDROIDX_JUNIT_VERSION = "1.2.1" +ANDROIDX_TRUTH_VERSION = "1.6.0" ORCHESTRATOR_VERSION = "1.6.0-alpha01" SERVICES_VERSION = "1.6.0-alpha01" diff --git a/gradle-tests/settings.gradle b/gradle-tests/settings.gradle index 9ba2bc287..18386a3d5 100644 --- a/gradle-tests/settings.gradle +++ b/gradle-tests/settings.gradle @@ -18,16 +18,16 @@ dependencyResolutionManagement { } versionCatalogs { libs { - library('core', 'androidx.test:core:1.7.0-alpha01') - library('runner', 'androidx.test:runner:1.7.0-alpha01') - library('ext.junit', 'androidx.test.ext:junit:1.3.0-alpha01') - library('ext.truth', 'androidx.test.ext:truth:1.7.0-alpha01') - library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.7.0-alpha01') - library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.7.0-alpha01') - library('espresso.core', 'androidx.test.espresso:espresso-core:3.7.0-alpha01') - library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.7.0-alpha01') - library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.7.0-alpha01') - library('espresso.web', 'androidx.test.espresso:espresso-web:3.7.0-alpha01') + library('core', 'androidx.test:core:1.6.1') + library('runner', 'androidx.test:runner:1.6.1') + library('ext.junit', 'androidx.test.ext:junit:1.2.1') + library('ext.truth', 'androidx.test.ext:truth:1.6.0') + library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.6.1') + library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.6.1') + library('espresso.core', 'androidx.test.espresso:espresso-core:3.6.1') + library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.6.1') + library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.6.1') + library('espresso.web', 'androidx.test.espresso:espresso-web:3.6.1') library('orchestrator', 'androidx.test:orchestrator:1.6.0-alpha01') }