Merge pull request #464 from android/axt12272022

brettchabot · web-flow · commit dc7a21f08125 · 2023-01-03T16:59:15.000-08:00
Update to androidx.test artifacts released on 01/03/2023
diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
@@ -26,7 +26,7 @@ allprojects {
 ext {
     buildToolsVersion = "32.0.0"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
 }
diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
@@ -28,9 +28,9 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
     truthVersion = "1.1.3"
 }
diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -28,11 +28,11 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
-    monitorVersion = "1.6.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
+    monitorVersion = "1.6.1"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
     orchestratorVersion = "1.4.2"
     truthVersion = "1.1.3"
 }
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -31,8 +31,8 @@ ext {
     robolectricVersion = "4.9"
     extTruthVersion = "1.5.0"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
+    espressoVersion = "3.5.1"
     guavaVersion = "31.1-android"
 }
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
@@ -32,7 +32,7 @@ ext {
     guavaVersion = "31.1-android"
     extTruthVersion = "1.5.0"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
+    espressoVersion = "3.5.1"
 }
diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle
@@ -28,9 +28,9 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
     robolectricVersion = "4.9"
 }
diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle
@@ -28,8 +28,8 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
+    espressoVersion = "3.5.1"
     robolectricVersion = "4.9"
 }
diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle
@@ -29,6 +29,6 @@ ext {
     buildToolsVersion = "32.0.0"
     robolectricVersion = "4.9"
     extTruthVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
+    extJUnitVersion = "1.1.5"
     espressoDeviceVersion = "1.0.0-alpha01"
 }
diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle
@@ -32,10 +32,10 @@ ext {
     androidxCompatVersion = "1.5.1"
     androidxFragmentVersion = "1.5.3"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
     robolectricVersion = "4.9"
     truthVersion = "1.1.3"
 }
diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle
@@ -44,7 +44,7 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
+    espressoVersion = "3.5.1"
 }
diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle
@@ -27,8 +27,8 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
 }
diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle
@@ -28,11 +28,11 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     androidxCoreVersion = "1.9.0"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
-    extJUnitVersion = "1.1.4"
+    espressoVersion = "3.5.1"
+    extJUnitVersion = "1.1.5"
     extTruthVersion = "1.5.0"
     robolectricVersion = "4.9"
 }
diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle
@@ -47,8 +47,8 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
 }
diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle
@@ -28,9 +28,9 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
 }
 
diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle
@@ -45,8 +45,8 @@ ext {
     androidxRecyclerVersion = "1.2.1"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
 }
diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle
@@ -6,10 +6,10 @@ buildscript {
     ext.buildToolsVersion = "32.0.0"
     ext.androidxCompatVersion = "1.5.1"
     ext.coreVersion = "1.5.0"
-    ext.extJUnitVersion = "1.1.4"
-    ext.runnerVersion = "1.5.0"
+    ext.extJUnitVersion = "1.1.5"
+    ext.runnerVersion = "1.5.2"
     ext.rulesVersion = "1.5.0"
-    ext.espressoVersion = "3.5.0"
+    ext.espressoVersion = "3.5.1"
     ext.servicesVersion = "1.4.2"
     ext.truthVersion = "1.1.3"
 
diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle
@@ -28,8 +28,8 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
 }
diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle
@@ -25,9 +25,9 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.4"
-    runnerVersion = "1.5.0"
+    extJUnitVersion = "1.1.5"
+    runnerVersion = "1.5.2"
     rulesVersion = "1.5.0"
-    espressoVersion = "3.5.0"
+    espressoVersion = "3.5.1"
     uiAutomatorVersion = "2.2.0"
 }
diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle
@@ -6,10 +6,10 @@ buildscript {
     ext.buildToolsVersion = "32.0.0"
     ext.androidxCompatVersion = "1.5.1"
     ext.coreVersion = "1.5.0"
-    ext.extJUnitVersion = "1.1.4"
-    ext.runnerVersion = "1.5.0"
+    ext.extJUnitVersion = "1.1.5"
+    ext.runnerVersion = "1.5.2"
     ext.rulesVersion = "1.5.0"
-    ext.espressoVersion = "3.5.0"
+    ext.espressoVersion = "3.5.1"
     ext.servicesVersion = "1.4.2"
     ext.truthVersion = "1.1.3"
     ext.googletestVersion = "1.11.0-beta-1"
diff --git a/update_versions.sh b/update_versions.sh
@@ -21,15 +21,15 @@ androidxFragmentVersion="1.5.3"         # ANDROIDX_FRAGMENT_VERSION
 androidxRecyclerVersion="1.2.1"         # ANDROIDX_RECYCLERVIEW_VERSION
 guavaVersion="31.1-android"           # GUAVA_VERSION
 truthVersion="1.1.3"                    # TRUTH_VERSION
-runnerVersion="1.5.0"           # RUNNER_VERSION
-monitorVersion="1.6.0"          # MONITOR_VERSION
+runnerVersion="1.5.2"           # RUNNER_VERSION
+monitorVersion="1.6.1"          # MONITOR_VERSION
 rulesVersion="1.5.0"            # RULES_VERSION
 servicesVersion="1.4.2"         # SERVICES_VERSION
 orchestratorVersion="1.4.2"     # ORCHESTRATOR_VERSION
 coreVersion="1.5.0"             # CORE_VERSION
-extJUnitVersion="1.1.4"         # ANDROIDX_JUNIT_VERSION
+extJUnitVersion="1.1.5"         # ANDROIDX_JUNIT_VERSION
 extTruthVersion="1.5.0"         # ANDROIDX_TRUTH_VERSION
-espressoVersion="3.5.0"         # ESPRESSO_VERSION
+espressoVersion="3.5.1"         # ESPRESSO_VERSION
 espressoDeviceVersion="1.0.0-alpha03"  # ESPRESSO_DEVICE_VERSION
 robolectricVersion="4.9"
 uiAutomatorVersion="2.2.0"              # UIAUTOMATOR_VERSION

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ ext {`
`29`	`29`	`buildToolsVersion = "32.0.0"`
`30`	`30`	`robolectricVersion = "4.9"`
`31`	`31`	`extTruthVersion = "1.5.0"`
`32`		`- extJUnitVersion = "1.1.4"`
	`32`	`+ extJUnitVersion = "1.1.5"`
`33`	`33`	`espressoDeviceVersion = "1.0.0-alpha01"`
`34`	`34`	`}`