Merge pull request #517 from android/updateVers

Update versions of test dependencies + AGP.
android · Aug 14, 2024 · 1b96a49 · 1b96a49
2 parents 8def210 + ee515c8
commit 1b96a49
Show file tree

Hide file tree

Showing 58 changed files with 213 additions and 211 deletions.
diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.1.1"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -24,8 +24,8 @@ allprojects {
 }
 
 ext {
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    rulesVersion = "1.6.0-alpha01"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    rulesVersion = "1.6.1"
 }
diff --git a/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties b/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle
@@ -2,11 +2,11 @@ apply plugin: "com.android.application"
 
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.androidjunitrunnersample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.1.1"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    rulesVersion = "1.6.0-alpha01"
-    espressoVersion = "3.6.0-alpha01"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    rulesVersion = "1.6.1"
+    espressoVersion = "3.6.1"
     truthVersion = "1.1.3"
 }
diff --git a/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidTestOrchestratorSample/app/build.gradle b/runner/AndroidTestOrchestratorSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.androidtestorchestratorsample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.1.1"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -26,12 +26,12 @@ allprojects {
 ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    monitorVersion = "1.7.0-alpha01"
-    rulesVersion = "1.6.0-alpha01"
-    espressoVersion = "3.6.0-alpha01"
-    orchestratorVersion = "1.5.0-alpha01"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    monitorVersion = "1.7.1"
+    rulesVersion = "1.6.1"
+    espressoVersion = "3.6.1"
+    orchestratorVersion = "1.5.0"
     truthVersion = "1.1.3"
 }
diff --git a/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...er/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties b/...er/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 01 11:09:45 PDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test_all.sh b/test_all.sh
@@ -9,7 +9,7 @@ for p in $(cat projects.conf); do
    echo "====================================================================="
 
    pushd $p > /dev/null  # Silent pushd
-   ./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info | sed "s@^@$p @"  # Prefix every line with directory
+   ./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info --no-watch-fs | sed "s@^@$p @"  # Prefix every line with directory
    code=${PIPESTATUS[0]}
    if [ "$code" -ne "0" ]; then
        exit $code

diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.espresso.AccessibilitySample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.7.10"
-    ext.agpVersion = "8.1.1"
+    ext.kotlinVersion = "1.9.22"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -27,11 +27,11 @@ allprojects {
 
 ext {
     androidxAnnotationVersion = "1.5.0"
-    robolectricVersion = "4.10.3"
-    extTruthVersion = "1.6.0-alpha01"
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    espressoVersion = "3.6.0-alpha01"
+    robolectricVersion = "4.13"
+    extTruthVersion = "1.6.0"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    espressoVersion = "3.6.1"
     guavaVersion = "31.1-android"
 }
diff --git a/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.espresso.BasicSample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.8.20"
-    ext.agpVersion = "8.1.1"
+    ext.kotlinVersion = "1.9.22"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -27,11 +27,11 @@ allprojects {
 
 ext {
     androidxAnnotationVersion = "1.5.0"
-    robolectricVersion = "4.10.3"
+    robolectricVersion = "4.13"
     guavaVersion = "31.1-android"
-    extTruthVersion = "1.6.0-alpha01"
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    espressoVersion = "3.6.0-alpha01"
+    extTruthVersion = "1.6.0"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    espressoVersion = "3.6.1"
 }
diff --git a/ui/espresso/BasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/BasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/CustomMatcherSample/app/build.gradle b/ui/espresso/CustomMatcherSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.espresso.CustomMatcherSample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.1.1"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -26,10 +26,10 @@ allprojects {
 ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    rulesVersion = "1.6.0-alpha01"
-    espressoVersion = "3.6.0-alpha01"
-    robolectricVersion = "4.10.3"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    rulesVersion = "1.6.1"
+    espressoVersion = "3.6.1"
+    robolectricVersion = "4.13"
 }
diff --git a/ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/DataAdapterSample/app/build.gradle b/ui/espresso/DataAdapterSample/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.espresso.DataAdapterSample"
-        minSdkVersion 14
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "8.1.1"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -26,9 +26,9 @@ allprojects {
 ext {
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
-    coreVersion = "1.6.0-alpha01"
-    extJUnitVersion = "1.2.0-alpha01"
-    runnerVersion = "1.6.0-alpha03"
-    espressoVersion = "3.6.0-alpha01"
-    robolectricVersion = "4.10.3"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    espressoVersion = "3.6.1"
+    robolectricVersion = "4.13"
 }
diff --git a/ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/EspressoDeviceSample/app/build.gradle b/ui/espresso/EspressoDeviceSample/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.espresso.EspressoDeviceSample"
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.8.20"
-    ext.agpVersion = '8.3.2'
+    ext.kotlinVersion = "1.9.22"
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
         google()
@@ -26,8 +26,8 @@ allprojects {
 }
 
 ext {
-    robolectricVersion = "4.10.3"
-    extTruthVersion = "1.6.0-alpha04"
-    extJUnitVersion = "1.2.0-alpha04"
+    robolectricVersion = "4.13"
+    extTruthVersion = "1.6.0"
+    extJUnitVersion = "1.2.1"
     espressoDeviceVersion = "1.0.0-alpha09"
 }
diff --git a/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists