Merge pull request #390 from android/140

brettchabot · web-flow · commit 0387cdf04461 · 2021-07-01T09:29:51.000-07:00
Update to androidx.test 1.4.0 / espresso 3.4.0
diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
@@ -24,8 +24,8 @@ allprojects {
 
 ext {
     buildToolsVersion = "30.0.2"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
 }
diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
@@ -26,9 +26,9 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -26,9 +26,9 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -29,9 +29,9 @@ ext {
     androidxAnnotationVersion = "1.1.0"
     robolectricVersion = "4.5.1"
     extTruthVersion = '1.3.1-alpha02'
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    espressoVersion = "3.4.0"
     guavaVersion = "29.0-android"
 }
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
@@ -30,8 +30,8 @@ ext {
     robolectricVersion = "4.5.1"
     guavaVersion = "29.0-android"
     extTruthVersion = '1.3.0-rc01'
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle
@@ -26,10 +26,10 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
     robolectricVersion = "4.5.1"
 }
diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle
@@ -26,9 +26,9 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    espressoVersion = "3.4.0"
     robolectricVersion = "4.5.1"
 }
diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle
@@ -30,11 +30,11 @@ ext {
     androidxCoreVersion = "1.2.0"
     androidxCompatVersion = "1.1.0-rc01"
     androidxFragmentVersion = "1.1.0-rc01"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
     robolectricVersion = "4.5.1"
     truthVersion = "1.0.1"
 }
diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle
@@ -42,8 +42,8 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle
@@ -25,9 +25,9 @@ allprojects {
 ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle
@@ -26,12 +26,12 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     androidxCoreVersion = "1.2.0"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    extTruthVersion = "1.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
+    extJUnitVersion = "1.1.3"
+    extTruthVersion = "1.4.0"
     robolectricVersion = "4.5.1"
 }
diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle
@@ -45,9 +45,9 @@ task clean(type: Delete) {
 ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle
@@ -26,10 +26,10 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
 
diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle
@@ -43,9 +43,9 @@ ext {
     androidxAnnotationVersion = "1.1.0"
     androidxRecyclerVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle
@@ -26,9 +26,9 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
 }
diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle
@@ -23,10 +23,10 @@ ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
     guavaVersion = "29.0-android"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
-    rulesVersion = "1.4.0-beta02"
-    espressoVersion = "3.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
+    rulesVersion = "1.4.0"
+    espressoVersion = "3.4.0"
     uiAutomatorVersion = "2.2.0"
 }
diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/build.gradle
@@ -25,9 +25,9 @@ allprojects {
 ext {
     buildToolsVersion = "30.0.2"
     androidxAnnotationVersion = "1.1.0"
-    coreVersion = "1.4.0-beta02"
-    extJUnitVersion = "1.1.3-beta02"
-    runnerVersion = "1.4.0-beta02"
+    coreVersion = "1.4.0"
+    extJUnitVersion = "1.1.3"
+    runnerVersion = "1.4.0"
     hamcrestVersion = "1.3"
     truthVersion = "1.0.1"
 }
diff --git a/update_versions.sh b/update_versions.sh
@@ -16,12 +16,12 @@ androidxCoreVersion="1.2.0"
 androidxRecyclerVersion="1.1.0"
 guavaVersion="29.0-android"
 truthVersion="1.0.1"
-runnerVersion="1.4.0-beta02"
-rulesVersion="1.4.0-beta02"
-coreVersion="1.4.0-beta02"
-extJUnitVersion="1.1.3-beta02"
-extTruthVersion="1.4.0-beta02"
-espressoVersion="3.4.0-beta02"
+runnerVersion="1.4.0"
+rulesVersion="1.4.0"
+coreVersion="1.4.0"
+extJUnitVersion="1.1.3"
+extTruthVersion="1.4.0"
+espressoVersion="3.4.0"
 robolectricVersion="4.5.1"
 uiAutomatorVersion="2.2.0"
 
