From 5ff52a76ee6378b096d3ad6b61846b52b43bb61b Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Tue, 22 Aug 2023 16:38:21 -0700 Subject: [PATCH 1/2] Upgrade to AGP 8.1.0 and kotlin 1.8.20. Use AGP Upgrade Assistant to upgrade all projects to AGP 8.1.0 and follow recommendations on deprecated attributes, including: - rename compileSdkVersion to compileSdk - remove buildToolsVersion as its now bundled with AGP --- .../ServiceTestRuleSample/app/build.gradle | 10 +++++----- .../app/src/main/AndroidManifest.xml | 3 +-- integration/ServiceTestRuleSample/build.gradle | 2 +- .../ServiceTestRuleSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../AndroidJunitRunnerSample/app/build.gradle | 4 ++-- .../app/src/main/AndroidManifest.xml | 3 +-- runner/AndroidJunitRunnerSample/build.gradle | 2 +- .../AndroidJunitRunnerSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../app/build.gradle | 4 ++-- .../app/src/main/AndroidManifest.xml | 3 +-- .../AndroidTestOrchestratorSample/build.gradle | 3 +-- .../gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../app/build.gradle | 6 +++--- .../app/src/main/AndroidManifest.xml | 3 +-- .../build.gradle | 17 ++++++++--------- .../gradle.properties | 5 ++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../AccessibilitySample/app/build.gradle | 11 ++++++----- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/AccessibilitySample/build.gradle | 3 +-- .../AccessibilitySample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/BasicSample/app/build.gradle | 13 ++++++------- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/BasicSample/build.gradle | 5 ++--- ui/espresso/BasicSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../CustomMatcherSample/app/build.gradle | 11 ++++++----- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/CustomMatcherSample/build.gradle | 3 +-- .../CustomMatcherSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/DataAdapterSample/app/build.gradle | 5 +++-- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/DataAdapterSample/build.gradle | 3 +-- ui/espresso/DataAdapterSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../EspressoDeviceSample/app/build.gradle | 13 ++++++------- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/EspressoDeviceSample/build.gradle | 3 +-- .../EspressoDeviceSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../FragmentScenarioSample/app/build.gradle | 5 ++--- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/FragmentScenarioSample/build.gradle | 2 +- .../FragmentScenarioSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../IdlingResourceSample/app/build.gradle | 11 ++++++----- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/IdlingResourceSample/build.gradle | 3 +-- .../IdlingResourceSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../IntentsAdvancedSample/app/build.gradle | 8 +++++--- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/IntentsAdvancedSample/build.gradle | 2 +- .../IntentsAdvancedSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/IntentsBasicSample/app/build.gradle | 11 ++++++----- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/IntentsBasicSample/build.gradle | 3 +-- .../IntentsBasicSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/MultiProcessSample/app/build.gradle | 5 +++-- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/MultiProcessSample/build.gradle | 3 +-- .../MultiProcessSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/MultiWindowSample/app/build.gradle | 11 ++++++----- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/MultiWindowSample/build.gradle | 2 +- ui/espresso/MultiWindowSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/RecyclerViewSample/app/build.gradle | 11 ++++++----- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/RecyclerViewSample/build.gradle | 3 +-- .../RecyclerViewSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/ScreenshotSample/app/build.gradle | 3 ++- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/ScreenshotSample/build.gradle | 4 ++-- ui/espresso/ScreenshotSample/gradle.properties | 5 ++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/WebBasicSample/app/build.gradle | 15 ++++++++------- .../app/src/main/AndroidManifest.xml | 3 +-- ui/espresso/WebBasicSample/build.gradle | 3 +-- ui/espresso/WebBasicSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/uiautomator/BasicSample/app/build.gradle | 5 +++-- .../app/src/androidTest/AndroidManifest.xml | 3 +-- .../app/src/main/AndroidManifest.xml | 3 +-- ui/uiautomator/BasicSample/build.gradle | 2 +- ui/uiautomator/BasicSample/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- unit/BasicNativeAndroidTest/app/build.gradle | 5 +++-- .../app/src/main/AndroidManifest.xml | 3 +-- unit/BasicNativeAndroidTest/build.gradle | 2 +- unit/BasicNativeAndroidTest/gradle.properties | 5 ++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- unit/BasicUnitAndroidTest/app/build.gradle | 5 +++-- .../app/src/main/AndroidManifest.xml | 6 +++--- unit/BasicUnitAndroidTest/build.gradle | 8 ++++---- unit/BasicUnitAndroidTest/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- update_versions.sh | 10 ++++------ 118 files changed, 251 insertions(+), 222 deletions(-) diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle index 24287ffed..da14aa8a4 100644 --- a/integration/ServiceTestRuleSample/app/build.gradle +++ b/integration/ServiceTestRuleSample/app/build.gradle @@ -1,8 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 - buildToolsVersion rootProject.buildToolsVersion + compileSdk 33 defaultConfig { applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample" minSdkVersion 14 @@ -12,9 +11,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { - abortOnError false - } productFlavors { } testOptions { @@ -31,6 +27,10 @@ android { } } } + namespace 'com.example.android.testing.ServiceTestRuleSample' + lint { + abortOnError false + } } dependencies { diff --git a/integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml b/integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml index d881131aa..5dc076f8c 100644 --- a/integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml +++ b/integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml @@ -16,8 +16,7 @@ --> - + - + - + - + - + - + diff --git a/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml b/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml index 1809e01ee..49d6267f0 100644 --- a/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + + - + diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle index a31da4e24..ad5a284cf 100644 --- 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 = "7.3.1" + ext.agpVersion = '8.1.0' repositories { // Insert local test repo here google() @@ -40,7 +40,6 @@ allprojects { } ext { - buildToolsVersion = "32.0.0" androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" coreVersion = "1.6.0-alpha01" diff --git a/ui/espresso/IdlingResourceSample/gradle.properties b/ui/espresso/IdlingResourceSample/gradle.properties index 519d28f0f..0b1d21b54 100644 --- a/ui/espresso/IdlingResourceSample/gradle.properties +++ b/ui/espresso/IdlingResourceSample/gradle.properties @@ -16,4 +16,7 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties index b1159fc54..3a0290794 100644 --- 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-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle index 5e92fb19b..9b2da163c 100644 --- a/ui/espresso/IntentsAdvancedSample/app/build.gradle +++ b/ui/espresso/IntentsAdvancedSample/app/build.gradle @@ -12,9 +12,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { - abortOnError false - } productFlavors { } testOptions { @@ -34,6 +31,11 @@ android { } } } + namespace 'com.example.android.testing.espresso.intents.AdvancedSample' + testNamespace 'com.example.android.testing.espresso.intents.AdvancedSample.test' + lint { + abortOnError false + } } dependencies { diff --git a/ui/espresso/IntentsAdvancedSample/app/src/androidTest/AndroidManifest.xml b/ui/espresso/IntentsAdvancedSample/app/src/androidTest/AndroidManifest.xml index 09cfa8a96..809093dee 100644 --- a/ui/espresso/IntentsAdvancedSample/app/src/androidTest/AndroidManifest.xml +++ b/ui/espresso/IntentsAdvancedSample/app/src/androidTest/AndroidManifest.xml @@ -1,8 +1,7 @@ - + diff --git a/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml b/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml index b24fe241f..7b59fcbb5 100644 --- a/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle index ae9872baa..66007706c 100644 --- 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 = "7.3.1" + ext.agpVersion = '8.1.0' repositories { // Insert local test repo here google() @@ -24,7 +24,6 @@ allprojects { } ext { - buildToolsVersion = "32.0.0" androidxAnnotationVersion = "1.5.0" androidxCoreVersion = "1.9.0" coreVersion = "1.6.0-alpha01" diff --git a/ui/espresso/IntentsBasicSample/gradle.properties b/ui/espresso/IntentsBasicSample/gradle.properties index 413608a46..261f7a6cb 100644 --- a/ui/espresso/IntentsBasicSample/gradle.properties +++ b/ui/espresso/IntentsBasicSample/gradle.properties @@ -19,5 +19,8 @@ android.useAndroidX=true android.enableJetifier=true android.useAndroidX=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties index b1159fc54..3a0290794 100644 --- 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-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ui/espresso/MultiProcessSample/app/build.gradle b/ui/espresso/MultiProcessSample/app/build.gradle index 97eba4724..9b6e76207 100644 --- a/ui/espresso/MultiProcessSample/app/build.gradle +++ b/ui/espresso/MultiProcessSample/app/build.gradle @@ -17,8 +17,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 - buildToolsVersion = rootProject.buildToolsVersion + compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.multiprocesssample" minSdkVersion 14 @@ -50,6 +49,8 @@ android { } } } + namespace 'com.example.android.testing.espresso.multiprocesssample' + testNamespace 'com.example.android.testing.espresso.multiprocesssample.test' } dependencies { diff --git a/ui/espresso/MultiProcessSample/app/src/androidTest/AndroidManifest.xml b/ui/espresso/MultiProcessSample/app/src/androidTest/AndroidManifest.xml index d1f881ce3..d7de9d7b8 100644 --- a/ui/espresso/MultiProcessSample/app/src/androidTest/AndroidManifest.xml +++ b/ui/espresso/MultiProcessSample/app/src/androidTest/AndroidManifest.xml @@ -16,8 +16,7 @@ ~ limitations under the License. --> - + - + - + - + - + - + diff --git a/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml b/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml index f47abb39f..c92a43bda 100644 --- a/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml +++ b/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + - + \ No newline at end of file diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle index 74822c057..a46d95f0a 100644 --- 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 = "7.3.1" + ext.agpVersion = '8.1.0' ext.kotlinVersion = "1.7.10" ext.androidxCoreVersion = "1.9.0" ext.buildToolsVersion = "32.0.0" diff --git a/unit/BasicNativeAndroidTest/gradle.properties b/unit/BasicNativeAndroidTest/gradle.properties index 252175276..dced6000e 100644 --- a/unit/BasicNativeAndroidTest/gradle.properties +++ b/unit/BasicNativeAndroidTest/gradle.properties @@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties index 8aaf1fcaa..2db8499d6 100644 --- 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-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/unit/BasicUnitAndroidTest/app/build.gradle b/unit/BasicUnitAndroidTest/app/build.gradle index f1565e484..582260862 100644 --- a/unit/BasicUnitAndroidTest/app/build.gradle +++ b/unit/BasicUnitAndroidTest/app/build.gradle @@ -1,17 +1,18 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdk 33 buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.unittesting.basicunitandroidtest" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + namespace 'com.example.android.testing.unittesting.basicunitandroidtest' } dependencies { diff --git a/unit/BasicUnitAndroidTest/app/src/main/AndroidManifest.xml b/unit/BasicUnitAndroidTest/app/src/main/AndroidManifest.xml index 6456c29a2..454db5791 100644 --- a/unit/BasicUnitAndroidTest/app/src/main/AndroidManifest.xml +++ b/unit/BasicUnitAndroidTest/app/src/main/AndroidManifest.xml @@ -14,8 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + + android:label="@string/app_name" + android:exported="true"> diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/build.gradle index aa2cc0a80..e1b17ad7c 100644 --- 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 = "7.3.0-alpha07" + ext.agpVersion = '8.1.0' repositories { // Insert local test repo here google() @@ -26,9 +26,9 @@ allprojects { ext { buildToolsVersion = "31.0.0" androidxAnnotationVersion = "1.2.0" - coreVersion = "1.4.1-alpha06" - extJUnitVersion = "1.1.4-alpha06" - runnerVersion = "1.5.0-alpha03" + coreVersion = "1.5.0" + extJUnitVersion = "1.1.4" + runnerVersion = "1.5.0" hamcrestVersion = "1.3" truthVersion = "1.1.3" } diff --git a/unit/BasicUnitAndroidTest/gradle.properties b/unit/BasicUnitAndroidTest/gradle.properties index 519d28f0f..0b1d21b54 100644 --- a/unit/BasicUnitAndroidTest/gradle.properties +++ b/unit/BasicUnitAndroidTest/gradle.properties @@ -16,4 +16,7 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties index b1159fc54..3a0290794 100644 --- 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-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/update_versions.sh b/update_versions.sh index bfb05604e..5920a64af 100755 --- a/update_versions.sh +++ b/update_versions.sh @@ -9,10 +9,9 @@ set -ex # Exit immediately if a command exits with a non-zero status. #repourl="https:\/\/oss.sonatype.org\/content\/repositories\/orgrobolectric-1216" #repourl="http:\/\/localhost:1480" # Versions: # axt_versions.bzl equivalents -buildToolsVersion="32.0.0" -agpVersion="7.3.1" -kotlinVersion="1.7.10" # KOTLIN_VERSION -compileSdkVersion="33" +agpVersion="8.1.0" +kotlinVersion="1.8.20" # KOTLIN_VERSION +compileSdk="33" targetSdkVersion="33" androidxAnnotationVersion="1.5.0" # ANDROIDX_ANNOTATION_VERSION androidxCompatVersion="1.5.1" # ANDROIDX_COMPAT_VERSION @@ -42,7 +41,6 @@ for p in $(cat projects.conf); do pushd $p > /dev/null # Silent pushd # Replace versions - sed -i "s/buildToolsVersion = \([\"']\).*\1/buildToolsVersion = \"$buildToolsVersion\"/" build.gradle sed -i "s/agpVersion = \([\"']\).*\1/agpVersion = \"$agpVersion\"/" build.gradle sed -i "s/kotlinVersion = \([\"']\).*\1/kotlinVersion = \"$kotlinVersion\"/" build.gradle sed -i "s/coreVersion = \([\"']\).*\1/coreVersion = \"$coreVersion\"/" build.gradle @@ -61,7 +59,7 @@ for p in $(cat projects.conf); do sed -i "s/androidxRecyclerVersion = \([\"']\).*\1/androidxRecyclerVersion = \"$androidxRecyclerVersion\"/" build.gradle sed -i "s/guavaVersion = \([\"']\).*\1/guavaVersion = \"$guavaVersion\"/" build.gradle sed -i "s/truthVersion = \([\"']\).*\1/truthVersion = \"$truthVersion\"/" build.gradle - sed -i "s/compileSdkVersion .*/compileSdkVersion $compileSdkVersion/" app/build.gradle + sed -i "s/compileSdk .*/compileSdk $compileSdk/" app/build.gradle sed -i "s/targetSdkVersion .*/targetSdkVersion $targetSdkVersion/" app/build.gradle sed -i "s/uiAutomatorVersion = \([\"']\).*\1/uiAutomatorVersion = \"$uiAutomatorVersion\"/" build.gradle sed -i "s/robolectricVersion = \([\"']\).*\1/robolectricVersion = \"$robolectricVersion\"/" build.gradle From a8d49405a22511b1bffb58f267dae5bf29c569a1 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Tue, 22 Aug 2023 17:47:32 -0700 Subject: [PATCH 2/2] Upgrade to AGP 8.1.1/gradle 8.20 and robolectric 4.10.3. This was necessary to get the tests working on a Mac with JDK 19. --- integration/ServiceTestRuleSample/build.gradle | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- runner/AndroidJunitRunnerSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- runner/AndroidTestOrchestratorSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../AndroidTestOrchestratorWithTestCoverageSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- test_all.sh | 2 +- ui/espresso/AccessibilitySample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/BasicSample/build.gradle | 2 +- .../BasicSample/gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/CustomMatcherSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/DataAdapterSample/build.gradle | 2 +- .../DataAdapterSample/gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/EspressoDeviceSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/FragmentScenarioSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/IdlingResourceSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/IntentsAdvancedSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/IntentsBasicSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/MultiProcessSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/MultiWindowSample/build.gradle | 2 +- .../MultiWindowSample/gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/RecyclerViewSample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/ScreenshotSample/build.gradle | 2 +- .../ScreenshotSample/gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/WebBasicSample/build.gradle | 2 +- .../WebBasicSample/gradle/wrapper/gradle-wrapper.properties | 2 +- ui/uiautomator/BasicSample/build.gradle | 2 +- .../BasicSample/gradle/wrapper/gradle-wrapper.properties | 2 +- unit/BasicNativeAndroidTest/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- unit/BasicUnitAndroidTest/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- update_versions.sh | 2 +- 44 files changed, 44 insertions(+), 45 deletions(-) diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle index d842c2dcb..42904b3de 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index ca20d789b..f17ceb6b9 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 4870f62eb..ea3bec985 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 69dc608fe..1ca1c26f8 100644 --- 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 index 8fa0c4fea..40ed313e6 100644 --- 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 index b2d9d2cb6..b95aabea1 100755 --- 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 index 880fef348..83c397b56 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 081e1e66a..9e63ff2dc 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 9e4a7f1d1..1ae2df2bf 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 2b73bf226..5334b8a7b 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index ea14c508d..8a11c06e6 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 1a9a1655c..d99650cbb 100644 --- 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 index 0677b9b62..3c4662d4e 100644 --- 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 index ad5a284cf..04fc1511b 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 2a6c6a158..d82697c43 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 66007706c..aa154f29c 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index eb47034a0..c44f7d408 100644 --- 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 index cb646d40f..227b8394a 100644 --- 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 index 29bbedee7..fcc3a9897 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index f14efcf37..b377251e3 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 0137f1046..60fc91229 100644 --- 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 index 2db8499d6..bf2443383 100644 --- 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 index 93796f402..db02b95eb 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index f9d2b64f3..2437405a4 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index a46d95f0a..347f16257 100644 --- 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 index 2db8499d6..bf2443383 100644 --- 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 index e1b17ad7c..2b0627d8d 100644 --- 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 index 3a0290794..b93c46a5f 100644 --- 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 index 5920a64af..e5a61796f 100755 --- 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