Merge pull request #2161 from android/axt_2024_02_29_release_branch_i…

…n_progress Update artifacts and version numbers for 2024_02_29 release
android · Feb 29, 2024 · 412fe35 · 412fe35
2 parents 8383d78 + 997b591
commit 412fe35
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 44 deletions.
diff --git a/BUILD b/BUILD
@@ -14,30 +14,7 @@ exports_files([
 maven_repository(
     name = "axt_m2repository",
     testonly = 1,
-    srcs = [
-        "//annotation/java/androidx/test/annotation:annotation_maven_artifact",
-        "//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/android_test_orchestrator/stubapp:orchestrator_release_maven_artifact"],
 )
 
 java_test(

diff --git a/build_extensions/axt_versions.bzl b/build_extensions/axt_versions.bzl
@@ -4,17 +4,17 @@ Use tools/release/validate_and_propagate_versions.sh to propagate these versions
 //:axt_m2_repository and gradle-tests/settings.gradle
 """
 
-RUNNER_VERSION = "1.6.0-alpha07"
-RULES_VERSION = "1.6.0-alpha04"
-MONITOR_VERSION = "1.7.0-alpha05"
-ESPRESSO_VERSION = "3.6.0-alpha04"
-CORE_VERSION = "1.6.0-alpha06"
-ESPRESSO_DEVICE_VERSION = "1.0.0-alpha09"
-ANDROIDX_JUNIT_VERSION = "1.2.0-alpha04"
-ANDROIDX_TRUTH_VERSION = "1.6.0-alpha04"
-ANNOTATION_VERSION = "1.1.0-alpha04"
+RUNNER_VERSION = "1.6.0-alpha06"
+RULES_VERSION = "1.6.0-alpha03"
+MONITOR_VERSION = "1.7.0-alpha04"
+ESPRESSO_VERSION = "3.6.0-alpha03"
+CORE_VERSION = "1.6.0-alpha05"
+ESPRESSO_DEVICE_VERSION = "1.0.0-alpha08"
+ANDROIDX_JUNIT_VERSION = "1.2.0-alpha03"
+ANDROIDX_TRUTH_VERSION = "1.6.0-alpha03"
+ANNOTATION_VERSION = "1.1.0-alpha03"
 ORCHESTRATOR_VERSION = "1.5.0-alpha03"
-SERVICES_VERSION = "1.5.0-alpha04"
+SERVICES_VERSION = "1.5.0-alpha03"
 
 # 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
@@ -18,16 +18,16 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         libs {
-            library('core', 'androidx.test:core:1.6.0-alpha06')
-            library('runner', 'androidx.test:runner:1.6.0-alpha07')
-            library('ext.junit', 'androidx.test.ext:junit:1.2.0-alpha04')
-            library('ext.truth', 'androidx.test.ext:truth:1.6.0-alpha04')
-            library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.6.0-alpha04')
-            library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.6.0-alpha04')
-            library('espresso.core', 'androidx.test.espresso:espresso-core:3.6.0-alpha04')
-            library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.6.0-alpha04')
-            library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.6.0-alpha04')
-            library('espresso.web', 'androidx.test.espresso:espresso-web:3.6.0-alpha04')
+            library('core', 'androidx.test:core:1.6.0-alpha05')
+            library('runner', 'androidx.test:runner:1.6.0-alpha06')
+            library('ext.junit', 'androidx.test.ext:junit:1.2.0-alpha03')
+            library('ext.truth', 'androidx.test.ext:truth:1.6.0-alpha03')
+            library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.6.0-alpha03')
+            library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.6.0-alpha03')
+            library('espresso.core', 'androidx.test.espresso:espresso-core:3.6.0-alpha03')
+            library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.6.0-alpha03')
+            library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.6.0-alpha03')
+            library('espresso.web', 'androidx.test.espresso:espresso-web:3.6.0-alpha03')
             library('orchestrator', 'androidx.test:orchestrator:1.5.0-alpha03')
 
         }