Merge pull request #2252 from android/axt_2024_05_14_stable_release_branch_in_progress

Merge changes for next stable release

Author: brettchabot

BUILD

@@ -27,15 +27,11 @@ maven_repository(
         "//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",
     ],
 )
 

WORKSPACE

@@ -67,6 +67,7 @@ load(
     "GUAVA_VERSION",
     "JUNIT_VERSION",
     "UIAUTOMATOR_VERSION",
+    "ATF_VERSION"
 )
 
 # gRPC
@@ -128,7 +129,7 @@ maven_install(
                 ),
             ],
             group = "com.google.android.apps.common.testing.accessibility.framework",
-            version = "3.1",
+            version = ATF_VERSION,
         ),
         "com.google.android.material:material:" + GOOGLE_MATERIAL_VERSION,
         "com.google.auto.value:auto-value:1.5.1",

build_extensions/axt_released_versions.bzl

@@ -1,12 +1,12 @@
 """Defines current released AXT versions."""
 
-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"
-ORCHESTRATOR_VERSION = "1.5.0-alpha04"
-SERVICES_VERSION = "1.5.0-alpha04"
+RUNNER_VERSION = "1.6.0"
+RULES_VERSION = "1.6.0"
+MONITOR_VERSION = "1.7.0"
+ESPRESSO_VERSION = "3.6.0"
+CORE_VERSION = "1.6.0"
+ESPRESSO_DEVICE_VERSION = "1.0.0"
+ANDROIDX_JUNIT_VERSION = "1.2.0"
+ANDROIDX_TRUTH_VERSION = "1.6.0"
+ORCHESTRATOR_VERSION = "1.5.0"
+SERVICES_VERSION = "1.5.0"

build_extensions/axt_versions.bzl

@@ -4,13 +4,13 @@ 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"
-RULES_VERSION = "1.6.0"
-MONITOR_VERSION = "1.7.0"
-ESPRESSO_VERSION = "3.6.0"
-CORE_VERSION = "1.6.0"
-ESPRESSO_DEVICE_VERSION = "1.0.0"
-ANDROIDX_JUNIT_VERSION = "1.2.0"
+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.5.0"
 SERVICES_VERSION = "1.5.0"

gradle-tests/settings.gradle

@@ -18,16 +18,16 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         libs {
-            library('core', 'androidx.test:core:1.6.0')
-            library('runner', 'androidx.test:runner:1.6.0')
-            library('ext.junit', 'androidx.test.ext:junit:1.2.0')
+            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.0')
-            library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.6.0')
-            library('espresso.core', 'androidx.test.espresso:espresso-core:3.6.0')
-            library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.6.0')
-            library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.6.0')
-            library('espresso.web', 'androidx.test.espresso:espresso-web:3.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.5.0')
 
         }

runner/monitor/CHANGELOG.md

@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Catch and log NoSuchMethodError on forceEnableAppTracing calls
+
 **New Features**
 
 **Breaking Changes**

runner/monitor/java/androidx/test/platform/tracing/AndroidXTracer.java

@@ -59,6 +59,12 @@ public AndroidXTracer enableTracing() {
       // The AndroidX call can fail if reflection is not allowed.
       // We want to log the error yet we should not break any test in this case.
       Log.e(TAG, "enableTracing failed", e);
+    } catch (NoSuchMethodError e) {
+      // This can occur if an androidx.tracing < 1.1.0 is put on classpath instead.
+      // See http://issuetracker.google.com/349628366).
+      // We want to log the error yet we should not break any test in this case.
+      Log.e(TAG, "enableTracing failed. "
+              + "You may need to upgrade your androidx.tracing:tracing version", e);
     }
     return this;
   }