Merge pull request #399 from android/141alpha01

brettchabot · web-flow · commit a39155367cc7 · 2021-09-09T13:43:31.000-07:00
Upgrade to androidx.test alpha libraries released on 08.23.21
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -30,9 +30,9 @@ ext {
     androidxAnnotationVersion = "1.1.0"
     robolectricVersion = "4.5.1"
     extTruthVersion = '1.3.1-alpha02'
-    coreVersion = "1.4.0"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
     guavaVersion = "29.0-android"
 }
diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation 'com.google.guava:guava:' + rootProject.guavaVersion
 
     // Testing-only dependencies
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
     androidTestImplementation 'androidx.test:core-ktx:' + rootProject.coreVersion
     androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.31'
     repositories {
         // Insert local test repo here
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -30,8 +30,8 @@ ext {
     robolectricVersion = "4.5.1"
     guavaVersion = "29.0-android"
     extTruthVersion = '1.3.0-rc01'
-    coreVersion = "1.4.0"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
     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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
     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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
     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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
-    extJUnitVersion = "1.1.3"
-    extTruthVersion = "1.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    extTruthVersion = "1.5.0-alpha01"
     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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
 
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
 }
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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
-    rulesVersion = "1.4.0"
-    espressoVersion = "3.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
+    rulesVersion = "1.4.1-alpha01"
+    espressoVersion = "3.5.0-alpha01"
     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"
-    extJUnitVersion = "1.1.3"
-    runnerVersion = "1.4.0"
+    coreVersion = "1.4.1-alpha01"
+    extJUnitVersion = "1.1.4-alpha01"
+    runnerVersion = "1.4.1-alpha01"
     hamcrestVersion = "1.3"
     truthVersion = "1.0.1"
 }
diff --git a/update_versions.sh b/update_versions.sh
@@ -5,7 +5,7 @@
 set -ex  # Exit immediately if a command exits with a non-zero status.
 
 #repourl="" # Leave empty to be ignored
-#repourl="file:\/\/\/~\/test_repos\/1.3.1-alpha01\/m2repository"
+#repourl="file:\/\/\/~\/test_repos\/1.4.1-alpha01\/m2repository"
 #repourl="https:\/\/oss.sonatype.org\/content\/repositories\/orgrobolectric-1216"
 #repourl="http:\/\/localhost:1480"
 buildToolsVersion="30.0.2"
@@ -16,12 +16,12 @@ androidxCoreVersion="1.2.0"
 androidxRecyclerVersion="1.1.0"
 guavaVersion="29.0-android"
 truthVersion="1.0.1"
-runnerVersion="1.4.0"
-rulesVersion="1.4.0"
-coreVersion="1.4.0"
-extJUnitVersion="1.1.3"
-extTruthVersion="1.4.0"
-espressoVersion="3.4.0"
+runnerVersion="1.4.1-alpha01"
+rulesVersion="1.4.1-alpha01"
+coreVersion="1.4.1-alpha01"
+extJUnitVersion="1.1.4-alpha01"
+extTruthVersion="1.5.0-alpha01"
+espressoVersion="3.5.0-alpha01"
 robolectricVersion="4.5.1"
 uiAutomatorVersion="2.2.0"
 
