Upgrade to AGP 8.1.1/gradle 8.20 and robolectric 4.10.3.

brettchabot · brettchabot · commit a8d49405a225 · 2023-08-22T17:47:32.000-07:00
This was necessary to get the tests working on a Mac with JDK 19.
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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
@@ -24,7 +24,6 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "32.0.0"
     coreVersion = "1.6.0-alpha01"
     extJUnitVersion = "1.2.0-alpha01"
     runnerVersion = "1.6.0-alpha03"
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties b/runner/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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.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 | sed "s@^@$p @"  # Prefix every line with directory
+   ./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info | sed "s@^@$p @"  # Prefix every line with directory
    code=${PIPESTATUS[0]}
    if [ "$code" -ne "0" ]; then
        exit $code
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.7.10"
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.8.20"
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.7.10"
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.7.10"
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         google()
         mavenCentral()
diff --git a/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     ext.kotlinVersion = "1.8.20"
     ext.androidxCoreVersion = "1.9.0"
     ext.buildToolsVersion = "32.0.0"
diff --git a/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Sep 30 12:30:46 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/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.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/ui/uiautomator/BasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/uiautomator/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.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = '8.1.0'
+    ext.agpVersion = '8.1.1'
     ext.kotlinVersion = "1.7.10"
     ext.androidxCoreVersion = "1.9.0"
     ext.buildToolsVersion = "32.0.0"
diff --git a/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Sep 30 12:30:46 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/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.0'
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
diff --git a/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/update_versions.sh b/update_versions.sh
@@ -30,7 +30,7 @@ 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"
+robolectricVersion="4.10.3"
 uiAutomatorVersion="2.2.0"              # UIAUTOMATOR_VERSION
 
 for p in $(cat projects.conf); do
