Merge pull request android#427 from android/update_2022_02_11

Update 2022_02_11
Zemotacqy · Feb 15, 2022 · a5c7c26 · a5c7c26
2 parents 4858929 + cc196e5
commit a5c7c26
Show file tree

Hide file tree

Showing 19 changed files with 138 additions and 135 deletions.
diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
@@ -25,8 +25,8 @@ allprojects {
 
 ext {
     buildToolsVersion = "31.0.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
 }
diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
@@ -27,9 +27,9 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -27,11 +27,11 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    monitorVersion = "1.5.0"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
-    orchestratorVersion = "1.4.1"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    monitorVersion = "1.6.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
+    orchestratorVersion = "1.4.2-alpha01"
 }
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.4.31"
+    ext.kotlinVersion = "1.6.10"
     ext.agpVersion = "7.0.2"
     repositories {
         // Insert local test repo here
@@ -29,10 +29,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     robolectricVersion = "4.6.1"
-    extTruthVersion = '1.3.1-alpha02'
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    extTruthVersion = "1.5.0-alpha04"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
     guavaVersion = "30.1.1-android"
 }
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.4.31"
+    ext.kotlinVersion = "1.6.10"
     ext.agpVersion = "7.0.2"
     repositories {
         // Insert local test repo here
@@ -30,9 +30,9 @@ ext {
     androidxAnnotationVersion = "1.2.0"
     robolectricVersion = "4.6.1"
     guavaVersion = "30.1.1-android"
-    extTruthVersion = '1.3.0-rc01'
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    extTruthVersion = "1.5.0-alpha04"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
     robolectricVersion = "4.6.1"
 }
diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle
@@ -27,9 +27,9 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
     robolectricVersion = "4.6.1"
 }
diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.4.31"
+    ext.kotlinVersion = "1.6.10"
     ext.agpVersion = "7.0.2"
     repositories {
         google()
@@ -31,11 +31,11 @@ ext {
     androidxCoreVersion = "1.6.0"
     androidxCompatVersion = "1.3.1"
     androidxFragmentVersion = "1.3.6"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
     robolectricVersion = "4.6.1"
     truthVersion = "1.1.3"
 }
diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle
@@ -43,8 +43,8 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle
@@ -26,9 +26,9 @@ allprojects {
 ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle
@@ -27,12 +27,12 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     androidxCoreVersion = "1.6.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    extTruthVersion = "1.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    extTruthVersion = "1.5.0-alpha04"
     robolectricVersion = "4.6.1"
 }
diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle
@@ -46,9 +46,9 @@ task clean(type: Delete) {
 ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
 
diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle
@@ -44,9 +44,9 @@ ext {
     androidxAnnotationVersion = "1.2.0"
     androidxRecyclerVersion = "1.2.1"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = "7.2.0-alpha03"
-    ext.kotlinVersion = '1.5.31'
+    ext.agpVersion = "7.0.2"
+    ext.kotlinVersion = "1.6.10"
     ext.androidxCoreVersion = "1.6.0"
     ext.buildToolsVersion = "31.0.0"
     ext.androidxCompatVersion = "1.3.1"
-    ext.coreVersion = "1.4.1-alpha03"
-    ext.extJUnitVersion = "1.1.4-alpha03"
-    ext.runnerVersion = "1.4.1-alpha03"
-    ext.rulesVersion = "1.4.1-alpha03"
-    ext.espressoVersion = "3.5.0-alpha03"
-    ext.servicesVersion = "1.4.1"
+    ext.coreVersion = "1.4.1-alpha04"
+    ext.extJUnitVersion = "1.1.4-alpha04"
+    ext.runnerVersion = "1.5.0-alpha01"
+    ext.rulesVersion = "1.4.1-alpha04"
+    ext.espressoVersion = "3.5.0-alpha04"
+    ext.servicesVersion = "1.4.2-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 = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle
@@ -24,10 +24,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
     uiAutomatorVersion = "2.2.0"
 }
diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/build.gradle
@@ -26,9 +26,9 @@ allprojects {
 ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
     hamcrestVersion = "1.3"
     truthVersion = "1.1.3"
 }