1 files changed, 13 insertions, 9 deletions
diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 650b4b66..7618ca8f 100755
--- a/common/androidx-test/update-from-gmaven.py
+++ b/common/androidx-test/update-from-gmaven.py
@@ -18,15 +18,16 @@ import os
 import subprocess
 import sys
 
-annotationVersion="1.0.1"
-monitorVersion="1.6.1"
-runnerVersion="1.5.3-alpha01"
-rulesVersion="1.5.0"
-espressoVersion="3.5.1"
-coreVersion="1.5.0"
-extJUnitVersion="1.1.5"
-extTruthVersion="1.5.0"
-servicesVersion="1.4.2"
+annotationVersion="1.1.0-alpha02"
+monitorVersion="1.7.0-alpha03"
+runnerVersion="1.6.0-alpha05"
+rulesVersion="1.6.0-alpha02"
+espressoVersion="3.6.0-alpha02"
+coreVersion="1.6.0-alpha04"
+extJUnitVersion="1.2.0-alpha02"
+extTruthVersion="1.6.0-alpha02"
+orchestratorVersion="1.5.0-alpha03"
+servicesVersion="1.5.0-alpha02"
 jankTestHelperVersion="1.0.1"
 
 mavenToBpPatternMap = {
@@ -130,6 +131,7 @@ downloadArtifact("androidx.test.ext", "truth", extTruthVersion)
 downloadArtifact("androidx.test.janktesthelper", "janktesthelper", jankTestHelperVersion)
 downloadArtifact("androidx.test.services", "storage", servicesVersion)
 downloadApk("androidx.test.services", "test-services", servicesVersion)
+downloadApk("androidx.test", "orchestrator", orchestratorVersion)
 
 
 atxRewriteStr = ""
@@ -145,6 +147,7 @@ cmd("pom2bp " + atxRewriteStr +
     "-rewrite androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common " +
     "-rewrite androidx.annotation:annotation=androidx.annotation_annotation " +
     "-rewrite org.hamcrest:hamcrest-integration=hamcrest " +
+    "-rewrite org.hamcrest:hamcrest-core=hamcrest " +
     "-rewrite javax.inject:javax.inject=jsr330 " +
     "-rewrite com.google.android.material:material=com.google.android.material_material " +
     "-rewrite androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout " +
@@ -152,6 +155,7 @@ cmd("pom2bp " + atxRewriteStr +
     "-rewrite androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview " +
     "-rewrite androidx.core:core=androidx.core_core " +
     "-rewrite androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils " +
+    "-rewrite androidx.appcompat:appcompat=androidx.appcompat_appcompat " +
     "-sdk-version current " +
     "-static-deps " +
     "-prepend prepend-license.txt " +