Merge pull request #472 from android/axt_test_03_13_2023

brettchabot · web-flow · commit a76330ba879c · 2023-03-21T11:25:13.000-07:00
Update to androidx.test 03.21.2023 release
diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
@@ -25,8 +25,8 @@ allprojects {
 
 ext {
     buildToolsVersion = "32.0.0"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
 }
diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
     truthVersion = "1.1.3"
 }
diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -27,12 +27,12 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    monitorVersion = "1.6.1"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
-    orchestratorVersion = "1.4.2"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    monitorVersion = "1.7.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
+    orchestratorVersion = "1.5.0-alpha01"
     truthVersion = "1.1.3"
 }
diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle
@@ -30,8 +30,8 @@ android {
                     // A lower resolution device is used here for better emulator performance
                     device = "Nexus One"
                     apiLevel = 30
-                    // Also use the AOSP ATD image for better emulator performance
-                    systemImageSource = "aosp-atd"
+                    // TODO: switch to aosp-atd image once it supports browser intents
+                    systemImageSource = "aosp"
                 }
             }
         }
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -29,10 +29,10 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     robolectricVersion = "4.9"
-    extTruthVersion = "1.5.0"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    espressoVersion = "3.5.1"
+    extTruthVersion = "1.6.0-alpha01"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
     guavaVersion = "31.1-android"
 }
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
@@ -30,9 +30,9 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     robolectricVersion = "4.9"
     guavaVersion = "31.1-android"
-    extTruthVersion = "1.5.0"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    espressoVersion = "3.5.1"
+    extTruthVersion = "1.6.0-alpha01"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
 }
diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
     robolectricVersion = "4.9"
 }
diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle
@@ -27,9 +27,9 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
     robolectricVersion = "4.9"
 }
diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle
@@ -28,7 +28,7 @@ allprojects {
 ext {
     buildToolsVersion = "32.0.0"
     robolectricVersion = "4.9"
-    extTruthVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
+    extTruthVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
     espressoDeviceVersion = "1.0.0-alpha01"
 }
diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle
@@ -31,11 +31,11 @@ ext {
     androidxCoreVersion = "1.9.0"
     androidxCompatVersion = "1.5.1"
     androidxFragmentVersion = "1.5.3"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
     robolectricVersion = "4.9"
     truthVersion = "1.1.3"
 }
diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle
@@ -43,8 +43,8 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
 }
diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle
@@ -26,9 +26,9 @@ allprojects {
 ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
 }
diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle
@@ -27,12 +27,12 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     androidxCoreVersion = "1.9.0"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
-    extJUnitVersion = "1.1.5"
-    extTruthVersion = "1.5.0"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    extTruthVersion = "1.6.0-alpha01"
     robolectricVersion = "4.9"
 }
diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle
@@ -46,9 +46,9 @@ task clean(type: Delete) {
 ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
 }
diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
 }
 
diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle
@@ -44,9 +44,9 @@ ext {
     androidxAnnotationVersion = "1.5.0"
     androidxRecyclerVersion = "1.2.1"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
 }
diff --git a/ui/espresso/ScreenshotSample/app/build.gradle b/ui/espresso/ScreenshotSample/app/build.gradle
@@ -55,6 +55,9 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$androidxCompatVersion"
     implementation "com.google.android.material:material:1.4.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    // force upgrade to 1.1.0 because its required by androidTestImplementation,
+    // and without this statement AGP will silently downgrade to tracing:1.0.0
+    implementation "androidx.tracing:tracing:1.1.0"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation "androidx.test.ext:junit-ktx:$extJUnitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle
@@ -5,12 +5,12 @@ buildscript {
     ext.androidxCoreVersion = "1.9.0"
     ext.buildToolsVersion = "32.0.0"
     ext.androidxCompatVersion = "1.5.1"
-    ext.coreVersion = "1.5.0"
-    ext.extJUnitVersion = "1.1.5"
-    ext.runnerVersion = "1.5.2"
-    ext.rulesVersion = "1.5.0"
-    ext.espressoVersion = "3.5.1"
-    ext.servicesVersion = "1.4.2"
+    ext.coreVersion = "1.6.0-alpha01"
+    ext.extJUnitVersion = "1.2.0-alpha01"
+    ext.runnerVersion = "1.6.0-alpha01"
+    ext.rulesVersion = "1.6.0-alpha01"
+    ext.espressoVersion = "3.6.0-alpha01"
+    ext.servicesVersion = "1.5.0-alpha01"
     ext.truthVersion = "1.1.3"
 
     repositories {
diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle
@@ -27,9 +27,9 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
 }
diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle
@@ -24,10 +24,10 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.5.0"
-    extJUnitVersion = "1.1.5"
-    runnerVersion = "1.5.2"
-    rulesVersion = "1.5.0"
-    espressoVersion = "3.5.1"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha01"
+    rulesVersion = "1.6.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
     uiAutomatorVersion = "2.2.0"
 }
diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle
@@ -5,12 +5,12 @@ buildscript {
     ext.androidxCoreVersion = "1.9.0"
     ext.buildToolsVersion = "32.0.0"
     ext.androidxCompatVersion = "1.5.1"
-    ext.coreVersion = "1.5.0"
-    ext.extJUnitVersion = "1.1.5"
-    ext.runnerVersion = "1.5.2"
-    ext.rulesVersion = "1.5.0"
-    ext.espressoVersion = "3.5.1"
-    ext.servicesVersion = "1.4.2"
+    ext.coreVersion = "1.6.0-alpha01"
+    ext.extJUnitVersion = "1.2.0-alpha01"
+    ext.runnerVersion = "1.6.0-alpha01"
+    ext.rulesVersion = "1.6.0-alpha01"
+    ext.espressoVersion = "3.6.0-alpha01"
+    ext.servicesVersion = "1.5.0-alpha01"
     ext.truthVersion = "1.1.3"
     ext.googletestVersion = "1.11.0-beta-1"
     ext.junitGtestVersion = "1.0.0-alpha01"
diff --git a/update_versions.sh b/update_versions.sh
@@ -21,16 +21,16 @@ 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.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.5"         # ANDROIDX_JUNIT_VERSION
-extTruthVersion="1.5.0"         # ANDROIDX_TRUTH_VERSION
-espressoVersion="3.5.1"         # ESPRESSO_VERSION
-espressoDeviceVersion="1.0.0-alpha03"  # ESPRESSO_DEVICE_VERSION
+runnerVersion="1.6.0-alpha01"           # RUNNER_VERSION
+monitorVersion="1.7.0-alpha01"          # MONITOR_VERSION
+rulesVersion="1.6.0-alpha01"            # RULES_VERSION
+servicesVersion="1.5.0-alpha01"         # SERVICES_VERSION
+orchestratorVersion="1.5.0-alpha01"     # ORCHESTRATOR_VERSION
+coreVersion="1.6.0-alpha01"             # CORE_VERSION
+extJUnitVersion="1.2.0-alpha01"         # ANDROIDX_JUNIT_VERSION
+extTruthVersion="1.6.0-alpha01"         # ANDROIDX_TRUTH_VERSION
+espressoVersion="3.6.0-alpha01"         # ESPRESSO_VERSION
+espressoDeviceVersion="1.0.0-alpha04"  # ESPRESSO_DEVICE_VERSION
 robolectricVersion="4.9"
 uiAutomatorVersion="2.2.0"              # UIAUTOMATOR_VERSION
 

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ android {`
`30`	`30`	`// A lower resolution device is used here for better emulator performance`
`31`	`31`	`device = "Nexus One"`
`32`	`32`	`apiLevel = 30`
`33`		`- // Also use the AOSP ATD image for better emulator performance`
`34`		`- systemImageSource = "aosp-atd"`
	`33`	`+ // TODO: switch to aosp-atd image once it supports browser intents`
	`34`	`+ systemImageSource = "aosp"`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`