From ee515c8a06ac69d0b3659eb5450003a0a6dd89dd Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Thu, 1 Aug 2024 21:50:18 +0000 Subject: [PATCH] Update versions of test dependencies + AGP. Update to: - latest stable releases for androidx.test.* - robolectric 4.13 - AGP 8.5.0 - minSdk 21 - compileSdk + targetSdk 34 - kotlin 1.9.22 Also use -no-watch-fs in test-all.sh to reduce filesystem related logspan --- .../ServiceTestRuleSample/app/build.gradle | 6 ++-- .../ServiceTestRuleSample/build.gradle | 10 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../AndroidJunitRunnerSample/app/build.gradle | 6 ++-- runner/AndroidJunitRunnerSample/build.gradle | 12 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../app/build.gradle | 6 ++-- .../build.gradle | 16 ++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- test_all.sh | 2 +- .../AccessibilitySample/app/build.gradle | 6 ++-- ui/espresso/AccessibilitySample/build.gradle | 16 ++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/BasicSample/app/build.gradle | 6 ++-- ui/espresso/BasicSample/build.gradle | 16 ++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../CustomMatcherSample/app/build.gradle | 6 ++-- ui/espresso/CustomMatcherSample/build.gradle | 14 ++++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../DataAdapterSample/app/build.gradle | 6 ++-- ui/espresso/DataAdapterSample/build.gradle | 12 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../EspressoDeviceSample/app/build.gradle | 6 ++-- ui/espresso/EspressoDeviceSample/build.gradle | 10 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../FragmentScenarioSample/app/build.gradle | 6 ++-- .../FragmentScenarioSample/build.gradle | 16 ++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../IdlingResourceSample/app/build.gradle | 6 ++-- ui/espresso/IdlingResourceSample/build.gradle | 10 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../IntentsAdvancedSample/app/build.gradle | 4 +-- .../IntentsAdvancedSample/build.gradle | 12 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../IntentsBasicSample/app/build.gradle | 6 ++-- ui/espresso/IntentsBasicSample/build.gradle | 18 +++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../MultiProcessSample/app/build.gradle | 6 ++-- ui/espresso/MultiProcessSample/build.gradle | 12 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../MultiWindowSample/app/build.gradle | 6 ++-- ui/espresso/MultiWindowSample/build.gradle | 12 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../RecyclerViewSample/app/build.gradle | 6 ++-- ui/espresso/RecyclerViewSample/build.gradle | 12 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/espresso/ScreenshotSample/app/build.gradle | 4 +-- ui/espresso/ScreenshotSample/build.gradle | 16 ++++----- .../gradle/wrapper/gradle-wrapper.properties | 6 ++-- ui/espresso/WebBasicSample/app/build.gradle | 6 ++-- ui/espresso/WebBasicSample/build.gradle | 12 +++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ui/uiautomator/BasicSample/app/build.gradle | 6 ++-- ui/uiautomator/BasicSample/build.gradle | 14 ++++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- update_versions.sh | 34 ++++++++++--------- 58 files changed, 213 insertions(+), 211 deletions(-) diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle index 87c2123e..5d2f7c61 100644 --- 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 index cf05e7e2..2b290b52 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.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 index b93c46a5..48c0a02c 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.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 index 9c1119e8..07276315 100644 --- 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 index 297f5964..2ae25590 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.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 index b93c46a5..48c0a02c 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.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 index a4ee96c7..ddd12249 100644 --- 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 index 176b6eb4..0d83b3c4 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.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 index b93c46a5..48c0a02c 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.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/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties index 40ed313e..92b8c8ef 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.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 index b95aabea..0adbd803 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 --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 index 6bb2ac9f..0511b3aa 100644 --- 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 index f43dd329..7d67bb02 100644 --- 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 index b93c46a5..48c0a02c 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.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 index 071f6da2..4e3d9122 100644 --- 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 index 0b7e5d34..817618f6 100644 --- 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 index b93c46a5..48c0a02c 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.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 index 9e783672..0774be6b 100644 --- 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 index 3769dd5e..33e0a514 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.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 index b93c46a5..48c0a02c 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.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 index 89f4a952..35076625 100644 --- 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 index 322703f3..86a5128e 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.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 index b93c46a5..48c0a02c 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.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 index 3bb580bb..a8a23dd6 100644 --- 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 index ed7b0e3a..eb45cb2d 100644 --- 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 index fce403e4..48c0a02c 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.4-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/FragmentScenarioSample/app/build.gradle b/ui/espresso/FragmentScenarioSample/app/build.gradle index 881bfe68..eac4095e 100644 --- a/ui/espresso/FragmentScenarioSample/app/build.gradle +++ b/ui/espresso/FragmentScenarioSample/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.FragmentScenarioSample" - minSdkVersion 15 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle index c0be8993..c2a028ac 100644 --- a/ui/espresso/FragmentScenarioSample/build.gradle +++ b/ui/espresso/FragmentScenarioSample/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 { google() mavenCentral() @@ -31,11 +31,11 @@ ext { androidxCoreVersion = "1.9.0" androidxCompatVersion = "1.5.1" androidxFragmentVersion = "1.5.3" - 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" truthVersion = "1.1.3" } diff --git a/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/FragmentScenarioSample/gradle/wrapper/gradle-wrapper.properties index 3c4662d4..c00c06d3 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.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip diff --git a/ui/espresso/IdlingResourceSample/app/build.gradle b/ui/espresso/IdlingResourceSample/app/build.gradle index 3852b41b..4da492c3 100644 --- a/ui/espresso/IdlingResourceSample/app/build.gradle +++ b/ui/espresso/IdlingResourceSample/app/build.gradle @@ -17,12 +17,12 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.espresso.IdlingResourceSample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle index 9ad557ee..c9f1833e 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.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -42,8 +42,8 @@ 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" + coreVersion = "1.6.1" + extJUnitVersion = "1.2.1" + runnerVersion = "1.6.1" + espressoVersion = "3.6.1" } diff --git a/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IdlingResourceSample/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.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/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle index 5dab6764..24df560a 100644 --- a/ui/espresso/IntentsAdvancedSample/app/build.gradle +++ b/ui/espresso/IntentsAdvancedSample/app/build.gradle @@ -5,8 +5,8 @@ android { buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.intents.AdvancedSample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle index a8cbd38c..f89d8d2d 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.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -26,9 +26,9 @@ allprojects { ext { buildToolsVersion = "32.0.0" androidxAnnotationVersion = "1.5.0" - 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" } diff --git a/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IntentsAdvancedSample/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.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/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle index 2984e925..08cca1c8 100644 --- a/ui/espresso/IntentsBasicSample/app/build.gradle +++ b/ui/espresso/IntentsBasicSample/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.espresso.IntentsBasicSample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle index 0d192307..e9666e2a 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.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -26,12 +26,12 @@ allprojects { ext { androidxAnnotationVersion = "1.5.0" androidxCoreVersion = "1.9.0" - 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" - extJUnitVersion = "1.2.0-alpha01" - extTruthVersion = "1.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" + extJUnitVersion = "1.2.1" + extTruthVersion = "1.6.0" + robolectricVersion = "4.13" } diff --git a/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.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/MultiProcessSample/app/build.gradle b/ui/espresso/MultiProcessSample/app/build.gradle index ed42da4d..c6f0b506 100644 --- a/ui/espresso/MultiProcessSample/app/build.gradle +++ b/ui/espresso/MultiProcessSample/app/build.gradle @@ -17,11 +17,11 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.espresso.multiprocesssample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle index e9647bf5..370d0443 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.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -45,9 +45,9 @@ task clean(type: Delete) { ext { androidxAnnotationVersion = "1.5.0" - 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" } diff --git a/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties index 227b8394..05697bdc 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.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip diff --git a/ui/espresso/MultiWindowSample/app/build.gradle b/ui/espresso/MultiWindowSample/app/build.gradle index 1e29bf35..c3653ba4 100644 --- a/ui/espresso/MultiWindowSample/app/build.gradle +++ b/ui/espresso/MultiWindowSample/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.espresso.MultiWindowSample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle index a50f1034..89808fc9 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.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" } diff --git a/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/MultiWindowSample/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.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/RecyclerViewSample/app/build.gradle b/ui/espresso/RecyclerViewSample/app/build.gradle index 47feee50..498d3fb9 100644 --- a/ui/espresso/RecyclerViewSample/app/build.gradle +++ b/ui/espresso/RecyclerViewSample/app/build.gradle @@ -17,11 +17,11 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.espresso.RecyclerViewSample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle index d1e81d3b..59899123 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.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -43,9 +43,9 @@ ext { androidxAnnotationVersion = "1.5.0" androidxRecyclerVersion = "1.2.1" 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" } diff --git a/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.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/ScreenshotSample/app/build.gradle b/ui/espresso/ScreenshotSample/app/build.gradle index 5c0f24cf..0d476e0b 100644 --- a/ui/espresso/ScreenshotSample/app/build.gradle +++ b/ui/espresso/ScreenshotSample/app/build.gradle @@ -5,12 +5,12 @@ plugins { apply plugin: "kotlin-android" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.espresso.screenshotsample" minSdk 19 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle index 0bbd2bd6..d2d1f745 100644 --- a/ui/espresso/ScreenshotSample/build.gradle +++ b/ui/espresso/ScreenshotSample/build.gradle @@ -1,16 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.agpVersion = '8.3.2' - ext.kotlinVersion = "1.8.20" + ext.agpVersion = "8.5.0" + ext.kotlinVersion = "1.9.22" ext.androidxCoreVersion = "1.9.0" ext.buildToolsVersion = "32.0.0" ext.androidxCompatVersion = "1.5.1" - ext.coreVersion = "1.6.0-alpha06" - ext.extJUnitVersion = "1.2.0-alpha04" - ext.runnerVersion = "1.6.0-alpha07" - ext.rulesVersion = "1.6.0-alpha04" - ext.espressoVersion = "3.6.0-alpha04" - ext.servicesVersion = "1.5.0-alpha04" + ext.coreVersion = "1.6.1" + ext.extJUnitVersion = "1.2.1" + ext.runnerVersion = "1.6.1" + ext.rulesVersion = "1.6.1" + ext.espressoVersion = "3.6.1" + ext.servicesVersion = "1.5.0" ext.truthVersion = "1.1.3" repositories { diff --git a/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties index 2a32d0e8..6cc5d867 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 +#Thu Aug 01 20:15:00 UTC 2024 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle index c4c0fa99..6c79f835 100644 --- a/ui/espresso/WebBasicSample/app/build.gradle +++ b/ui/espresso/WebBasicSample/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.espresso.web.BasicSample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle index e7c371b8..ff7dd3c0 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.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" - 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" } diff --git a/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/WebBasicSample/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.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/uiautomator/BasicSample/app/build.gradle b/ui/uiautomator/BasicSample/app/build.gradle index b3f6e0be..2f256a12 100644 --- a/ui/uiautomator/BasicSample/app/build.gradle +++ b/ui/uiautomator/BasicSample/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.uiautomator.BasicSample" - minSdkVersion 18 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle index 047575f8..8db56e0e 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.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -24,10 +24,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" - uiAutomatorVersion = "2.2.0" + coreVersion = "1.6.1" + extJUnitVersion = "1.2.1" + runnerVersion = "1.6.1" + rulesVersion = "1.6.1" + espressoVersion = "3.6.1" + uiAutomatorVersion = "2.3.0" } diff --git a/ui/uiautomator/BasicSample/gradle/wrapper/gradle-wrapper.properties b/ui/uiautomator/BasicSample/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicUnitAndroidTest/gradle/wrapper/gradle-wrapper.properties index b93c46a5..48c0a02c 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.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/update_versions.sh b/update_versions.sh index e5a61796..4cdb9b65 100755 --- a/update_versions.sh +++ b/update_versions.sh @@ -9,10 +9,11 @@ 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 -agpVersion="8.1.0" -kotlinVersion="1.8.20" # KOTLIN_VERSION -compileSdk="33" -targetSdkVersion="33" +agpVersion="8.5.0" +kotlinVersion="1.9.22" # KOTLIN_VERSION +compileSdk="34" +minSdkVersion="21" +targetSdkVersion="34" androidxAnnotationVersion="1.5.0" # ANDROIDX_ANNOTATION_VERSION androidxCompatVersion="1.5.1" # ANDROIDX_COMPAT_VERSION androidxCoreVersion="1.9.0" # ANDROIDX_CORE_VERSION @@ -20,18 +21,18 @@ androidxFragmentVersion="1.5.3" # ANDROIDX_FRAGMENT_VERSION androidxRecyclerVersion="1.2.1" # ANDROIDX_RECYCLERVIEW_VERSION guavaVersion="31.1-android" # GUAVA_VERSION truthVersion="1.1.3" # TRUTH_VERSION -runnerVersion="1.6.0-alpha03" # RUNNER_VERSION -monitorVersion="1.7.0-alpha01" # MONITOR_VERSION -rulesVersion="1.6.0-alpha01" # RULES_VERSION -servicesVersion="1.5.0-alpha01" # SERVICES_VERSION -orchestratorVersion="1.5.0-alpha01" # ORCHESTRATOR_VERSION -coreVersion="1.6.0-alpha01" # CORE_VERSION -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.10.3" -uiAutomatorVersion="2.2.0" # UIAUTOMATOR_VERSION +runnerVersion="1.6.1" # RUNNER_VERSION +monitorVersion="1.7.1" # MONITOR_VERSION +rulesVersion="1.6.1" # RULES_VERSION +servicesVersion="1.5.0" # SERVICES_VERSION +orchestratorVersion="1.5.0" # ORCHESTRATOR_VERSION +coreVersion="1.6.1" # CORE_VERSION +extJUnitVersion="1.2.1" # ANDROIDX_JUNIT_VERSION +extTruthVersion="1.6.0" # ANDROIDX_TRUTH_VERSION +espressoVersion="3.6.1" # ESPRESSO_VERSION +espressoDeviceVersion="1.0.1" # ESPRESSO_DEVICE_VERSION +robolectricVersion="4.13" +uiAutomatorVersion="2.3.0" # UIAUTOMATOR_VERSION for p in $(cat projects.conf); do echo @@ -60,6 +61,7 @@ for p in $(cat projects.conf); do sed -i "s/guavaVersion = \([\"']\).*\1/guavaVersion = \"$guavaVersion\"/" build.gradle sed -i "s/truthVersion = \([\"']\).*\1/truthVersion = \"$truthVersion\"/" build.gradle sed -i "s/compileSdk .*/compileSdk $compileSdk/" app/build.gradle + sed -i "s/minSdkVersion .*/minSdkVersion $minSdkVersion/" 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