Merge "Update to androidx.test libraries released on Jan 3 2023."

30 files changed, 28 insertions, 28 deletions

diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index fc95ae45..925f158d 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -83,7 +83,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.espresso.contrib-nodeps",
-    aars: ["androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.aar"],
+    aars: ["androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -129,7 +129,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.espresso.core-nodeps",
-    aars: ["androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.aar"],
+    aars: ["androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -179,7 +179,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.espresso.idling-resource-nodeps",
-    aars: ["androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.aar"],
+    aars: ["androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -207,7 +207,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.espresso.intents-nodeps",
-    aars: ["androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.aar"],
+    aars: ["androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -245,7 +245,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.espresso.web-nodeps",
-    aars: ["androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.aar"],
+    aars: ["androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -279,7 +279,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.ext.junit-nodeps",
-    aars: ["androidx/test/ext/junit/1.1.4/junit-1.1.4.aar"],
+    aars: ["androidx/test/ext/junit/1.1.5/junit-1.1.5.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -385,7 +385,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.monitor-nodeps",
-    aars: ["androidx/test/monitor/1.6.0/monitor-1.6.0.aar"],
+    aars: ["androidx/test/monitor/1.6.1/monitor-1.6.1.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -457,7 +457,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.runner-nodeps",
-    aars: ["androidx/test/runner/1.5.0/runner-1.5.0.aar"],
+    aars: ["androidx/test/runner/1.5.2/runner-1.5.2.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1-sources.jar
index 6dcc4300..6dcc4300 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1-sources.jar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.aar b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar
index f7943162..f7943162 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.aar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.pom b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.pom
index 1b2a99bf..2fee32db 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.0/espresso-contrib-3.5.0.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-contrib/3.5.1/espresso-contrib-3.5.1.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test.espresso</groupId>
   <artifactId>espresso-contrib</artifactId>
-  <version>3.5.0</version>
+  <version>3.5.1</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,13 +27,13 @@
     <dependency>
       <groupId>androidx.test.espresso</groupId>
       <artifactId>espresso-core</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>androidx.test.espresso</groupId>
       <artifactId>espresso-idling-resource</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1-sources.jar
index 53aec95b..53aec95b 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1-sources.jar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.aar b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar
index 11107dcd..11107dcd 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.aar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.pom b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
index ac40a8fd..b34d79c1 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-core/3.5.0/espresso-core-3.5.0.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-core/3.5.1/espresso-core-3.5.1.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test.espresso</groupId>
   <artifactId>espresso-core</artifactId>
-  <version>3.5.0</version>
+  <version>3.5.1</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -39,13 +39,13 @@
     <dependency>
       <groupId>androidx.test</groupId>
       <artifactId>runner</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>androidx.test.espresso</groupId>
       <artifactId>espresso-idling-resource</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1-sources.jar
index 7ca56485..7ca56485 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1-sources.jar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.aar b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar
index 2a8f39a2..2a8f39a2 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.aar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.pom b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.pom
index 345f0554..cd475d76 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.0/espresso-idling-resource-3.5.0.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-idling-resource/3.5.1/espresso-idling-resource-3.5.1.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test.espresso</groupId>
   <artifactId>espresso-idling-resource</artifactId>
-  <version>3.5.0</version>
+  <version>3.5.1</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1-sources.jar
index fb1fd3bc..fb1fd3bc 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1-sources.jar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.aar b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar
index 864bac9c..864bac9c 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.aar
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.aar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.pom b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.pom
index 74cd436b..ad484304 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.0/espresso-intents-3.5.0.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-intents/3.5.1/espresso-intents-3.5.1.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test.espresso</groupId>
   <artifactId>espresso-intents</artifactId>
-  <version>3.5.0</version>
+  <version>3.5.1</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>androidx.test.espresso</groupId>
       <artifactId>espresso-core</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.aar
deleted file mode 100644
index 284f4dac..00000000
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.aar
+++ /dev/null
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0-sources.jar b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1-sources.jar
index d6d83f19..dd47e2b1 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1-sources.jar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar
new file mode 100644
index 00000000..4a705cca
--- /dev/null
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.aar
diff --git a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.pom b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.pom
index 580f5a66..1d9ed45d 100644
--- a/common/androidx-test/androidx/test/espresso/espresso-web/3.5.0/espresso-web-3.5.0.pom
+++ b/common/androidx-test/androidx/test/espresso/espresso-web/3.5.1/espresso-web-3.5.1.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test.espresso</groupId>
   <artifactId>espresso-web</artifactId>
-  <version>3.5.0</version>
+  <version>3.5.1</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>androidx.test.espresso</groupId>
       <artifactId>espresso-core</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.aar b/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.aar
deleted file mode 100644
index f8e2dc67..00000000
--- a/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.aar
+++ /dev/null
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4-sources.jar b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar
index 5426e9af..de449bad 100644
--- a/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4-sources.jar
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5-sources.jar
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar
new file mode 100644
index 00000000..162d864f
--- /dev/null
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.aar
diff --git a/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.pom b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.pom
index 695b601d..7dd12cbd 100644
--- a/common/androidx-test/androidx/test/ext/junit/1.1.4/junit-1.1.4.pom
+++ b/common/androidx-test/androidx/test/ext/junit/1.1.5/junit-1.1.5.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test.ext</groupId>
   <artifactId>junit</artifactId>
-  <version>1.1.4</version>
+  <version>1.1.5</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>androidx.test</groupId>
       <artifactId>monitor</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.aar b/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.aar
deleted file mode 100644
index 3849e9f5..00000000
--- a/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.aar
+++ /dev/null
diff --git a/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0-sources.jar b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1-sources.jar
index 571f8267..4f89266c 100644
--- a/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0-sources.jar
+++ b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1-sources.jar
diff --git a/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar
new file mode 100644
index 00000000..116fcbe5
--- /dev/null
+++ b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.aar
diff --git a/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.pom b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.pom
index 127ebf03..a0ec941c 100644
--- a/common/androidx-test/androidx/test/monitor/1.6.0/monitor-1.6.0.pom
+++ b/common/androidx-test/androidx/test/monitor/1.6.1/monitor-1.6.1.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test</groupId>
   <artifactId>monitor</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.1</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
diff --git a/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.aar b/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.aar
deleted file mode 100644
index 39a510e4..00000000
--- a/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.aar
+++ /dev/null
diff --git a/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0-sources.jar b/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2-sources.jar
index bf32a63a..afc4076d 100644
--- a/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0-sources.jar
+++ b/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2-sources.jar
diff --git a/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.aar b/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.aar
new file mode 100644
index 00000000..2517c9b0
--- /dev/null
+++ b/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.aar
diff --git a/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.pom b/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.pom
index 364aceed..304162de 100644
--- a/common/androidx-test/androidx/test/runner/1.5.0/runner-1.5.0.pom
+++ b/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test</groupId>
   <artifactId>runner</artifactId>
-  <version>1.5.0</version>
+  <version>1.5.2</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>androidx.test</groupId>
       <artifactId>monitor</artifactId>
-      <version>[1.6.0]</version>
+      <version>[1.6.1]</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 67156cb1..75120488 100755
--- a/common/androidx-test/update-from-gmaven.py
+++ b/common/androidx-test/update-from-gmaven.py
@@ -19,12 +19,12 @@ import subprocess
 import sys
 
 annotationVersion="1.0.1"
-monitorVersion="1.6.0"
-runnerVersion="1.5.0"
+monitorVersion="1.6.1"
+runnerVersion="1.5.2"
 rulesVersion="1.5.0"
-espressoVersion="3.5.0"
+espressoVersion="3.5.1"
 coreVersion="1.5.0"
-extJUnitVersion="1.1.4"
+extJUnitVersion="1.1.5"
 extTruthVersion="1.5.0"
 servicesVersion="1.4.2"
 jankTestHelperVersion="1.0.1"