From e0cc54d1a5f8cffe57b4507e64fb413fd74dcac7 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 15 Sep 2023 11:24:23 -0700 Subject: [PATCH] Update to new androidx.test artifacts. - Update to androidx.test.core 1.6.0-alpha02, monitor 1.7.0-alpha02 and espresso device 1.0.0-alpha05. - Globally update to min sdk 19 - Also add a 'mavenLocal()' repo to enable easier testing --- integration/ServiceTestRuleSample/app/build.gradle | 2 +- integration/ServiceTestRuleSample/build.gradle | 8 +++++--- runner/AndroidJunitRunnerSample/app/build.gradle | 2 +- runner/AndroidJunitRunnerSample/build.gradle | 8 +++++--- runner/AndroidTestOrchestratorSample/app/build.gradle | 2 +- runner/AndroidTestOrchestratorSample/build.gradle | 10 ++++++---- .../app/build.gradle | 2 +- .../build.gradle | 8 +++++--- ui/espresso/AccessibilitySample/app/build.gradle | 2 +- ui/espresso/AccessibilitySample/build.gradle | 8 +++++--- ui/espresso/BasicSample/app/build.gradle | 2 +- ui/espresso/BasicSample/build.gradle | 8 +++++--- ui/espresso/CustomMatcherSample/app/build.gradle | 2 +- ui/espresso/CustomMatcherSample/build.gradle | 8 +++++--- ui/espresso/DataAdapterSample/app/build.gradle | 2 +- ui/espresso/DataAdapterSample/build.gradle | 8 +++++--- ui/espresso/EspressoDeviceSample/app/build.gradle | 2 +- ui/espresso/EspressoDeviceSample/build.gradle | 8 +++++--- ui/espresso/FragmentScenarioSample/app/build.gradle | 2 +- ui/espresso/FragmentScenarioSample/build.gradle | 10 ++++++---- ui/espresso/IdlingResourceSample/app/build.gradle | 2 +- ui/espresso/IdlingResourceSample/build.gradle | 8 +++++--- ui/espresso/IntentsAdvancedSample/app/build.gradle | 2 +- ui/espresso/IntentsAdvancedSample/build.gradle | 8 +++++--- ui/espresso/IntentsBasicSample/app/build.gradle | 2 +- ui/espresso/IntentsBasicSample/build.gradle | 8 +++++--- ui/espresso/MultiProcessSample/app/build.gradle | 2 +- ui/espresso/MultiProcessSample/build.gradle | 8 +++++--- ui/espresso/MultiWindowSample/app/build.gradle | 2 +- ui/espresso/MultiWindowSample/build.gradle | 8 +++++--- ui/espresso/RecyclerViewSample/app/build.gradle | 2 +- ui/espresso/RecyclerViewSample/build.gradle | 8 +++++--- ui/espresso/ScreenshotSample/build.gradle | 5 +++-- ui/espresso/WebBasicSample/app/build.gradle | 2 +- ui/espresso/WebBasicSample/build.gradle | 8 +++++--- ui/uiautomator/BasicSample/app/build.gradle | 2 +- ui/uiautomator/BasicSample/build.gradle | 8 +++++--- unit/BasicNativeAndroidTest/build.gradle | 5 +++-- unit/BasicSample-kotlinApp/app/build.gradle | 2 +- unit/BasicSample-kotlinApp/build.gradle | 6 ++++-- unit/BasicSample/app/build.gradle | 2 +- unit/BasicSample/build.gradle | 6 ++++-- unit/BasicUnitAndroidTest/app/build.gradle | 2 +- unit/BasicUnitAndroidTest/build.gradle | 6 ++++-- update_versions.sh | 6 +++--- 45 files changed, 134 insertions(+), 90 deletions(-) diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle index 87c2123ef..e016e5c7b 100644 --- a/integration/ServiceTestRuleSample/app/build.gradle +++ b/integration/ServiceTestRuleSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle index cf05e7e23..62fec057d 100644 --- a/integration/ServiceTestRuleSample/build.gradle +++ b/integration/ServiceTestRuleSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,12 +20,13 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle index 9c1119e8c..8a56aac47 100644 --- a/runner/AndroidJunitRunnerSample/app/build.gradle +++ b/runner/AndroidJunitRunnerSample/app/build.gradle @@ -5,7 +5,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.androidjunitrunnersample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle index 297f5964b..acec71ba3 100644 --- a/runner/AndroidJunitRunnerSample/build.gradle +++ b/runner/AndroidJunitRunnerSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,7 +20,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -27,7 +29,7 @@ ext { buildToolsVersion = "32.0.0" androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/runner/AndroidTestOrchestratorSample/app/build.gradle b/runner/AndroidTestOrchestratorSample/app/build.gradle index a4ee96c7e..892bb914c 100644 --- a/runner/AndroidTestOrchestratorSample/app/build.gradle +++ b/runner/AndroidTestOrchestratorSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.androidtestorchestratorsample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle index 176b6eb41..34c1a259c 100644 --- a/runner/AndroidTestOrchestratorSample/build.gradle +++ b/runner/AndroidTestOrchestratorSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,17 +20,18 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" - monitorVersion = "1.7.0-alpha01" + monitorVersion = "1.7.0-alpha02" rulesVersion = "1.6.0-alpha01" espressoVersion = "3.6.0-alpha01" orchestratorVersion = "1.5.0-alpha01" diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle index ae0284998..c5fb5749f 100644 --- a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle +++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.androidtestorchestratorsample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle index 9ddb36c16..c2a85c479 100644 --- a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle +++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,14 +20,15 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { androidxAnnotationVersion = "1.2.0" guavaVersion = "30.1.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle index 6bb2ac9f5..1d5bc189a 100644 --- a/ui/espresso/AccessibilitySample/app/build.gradle +++ b/ui/espresso/AccessibilitySample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.AccessibilitySample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle index f43dd329c..5d2ed3d5d 100644 --- a/ui/espresso/AccessibilitySample/build.gradle +++ b/ui/espresso/AccessibilitySample/build.gradle @@ -6,7 +6,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -21,7 +22,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -29,7 +31,7 @@ ext { androidxAnnotationVersion = "1.5.0" robolectricVersion = "4.10.3" extTruthVersion = "1.6.0-alpha01" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" espressoVersion = "3.6.0-alpha01" diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle index 071f6da20..6eedb0cc9 100644 --- a/ui/espresso/BasicSample/app/build.gradle +++ b/ui/espresso/BasicSample/app/build.gradle @@ -6,7 +6,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.BasicSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle index 0b7e5d34c..371e15828 100644 --- a/ui/espresso/BasicSample/build.gradle +++ b/ui/espresso/BasicSample/build.gradle @@ -6,7 +6,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -21,7 +22,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -30,7 +32,7 @@ ext { robolectricVersion = "4.10.3" guavaVersion = "31.1-android" extTruthVersion = "1.6.0-alpha01" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" espressoVersion = "3.6.0-alpha01" diff --git a/ui/espresso/CustomMatcherSample/app/build.gradle b/ui/espresso/CustomMatcherSample/app/build.gradle index 9e783672d..3fa1d8f53 100644 --- a/ui/espresso/CustomMatcherSample/app/build.gradle +++ b/ui/espresso/CustomMatcherSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.CustomMatcherSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle index 3769dd5e2..30df2a570 100644 --- a/ui/espresso/CustomMatcherSample/build.gradle +++ b/ui/espresso/CustomMatcherSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,14 +20,15 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/DataAdapterSample/app/build.gradle b/ui/espresso/DataAdapterSample/app/build.gradle index 89f4a9522..5944405a8 100644 --- a/ui/espresso/DataAdapterSample/app/build.gradle +++ b/ui/espresso/DataAdapterSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.DataAdapterSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle index 322703f3c..95b1a439e 100644 --- a/ui/espresso/DataAdapterSample/build.gradle +++ b/ui/espresso/DataAdapterSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,14 +20,15 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" espressoVersion = "3.6.0-alpha01" diff --git a/ui/espresso/EspressoDeviceSample/app/build.gradle b/ui/espresso/EspressoDeviceSample/app/build.gradle index 806ea4543..5fbb36eff 100644 --- a/ui/espresso/EspressoDeviceSample/app/build.gradle +++ b/ui/espresso/EspressoDeviceSample/app/build.gradle @@ -6,7 +6,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.EspressoDeviceSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle index 8f441bd84..d5b97e39d 100644 --- a/ui/espresso/EspressoDeviceSample/build.gradle +++ b/ui/espresso/EspressoDeviceSample/build.gradle @@ -6,7 +6,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -21,7 +22,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -29,5 +31,5 @@ ext { robolectricVersion = "4.10.3" extTruthVersion = "1.6.0-alpha01" extJUnitVersion = "1.2.0-alpha01" - espressoDeviceVersion = "1.0.0-alpha01" + espressoDeviceVersion = "1.0.0-alpha05" } diff --git a/ui/espresso/FragmentScenarioSample/app/build.gradle b/ui/espresso/FragmentScenarioSample/app/build.gradle index 881bfe683..44ac3808f 100644 --- a/ui/espresso/FragmentScenarioSample/app/build.gradle +++ b/ui/espresso/FragmentScenarioSample/app/build.gradle @@ -6,7 +6,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.FragmentScenarioSample" - minSdkVersion 15 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle index c0be89938..a09e49041 100644 --- a/ui/espresso/FragmentScenarioSample/build.gradle +++ b/ui/espresso/FragmentScenarioSample/build.gradle @@ -1,11 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlinVersion = "1.7.10" + ext.kotlinVersion = "1.8.20" ext.agpVersion = "8.1.1" repositories { google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { @@ -17,7 +18,8 @@ buildscript { allprojects { repositories { google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -31,7 +33,7 @@ ext { androidxCoreVersion = "1.9.0" androidxCompatVersion = "1.5.1" androidxFragmentVersion = "1.5.3" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/IdlingResourceSample/app/build.gradle b/ui/espresso/IdlingResourceSample/app/build.gradle index 3852b41bd..7becd6e2a 100644 --- a/ui/espresso/IdlingResourceSample/app/build.gradle +++ b/ui/espresso/IdlingResourceSample/app/build.gradle @@ -21,7 +21,7 @@ android { defaultConfig { applicationId "com.example.android.testing.espresso.IdlingResourceSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle index 9ad557ee0..e6dfdf3f1 100644 --- a/ui/espresso/IdlingResourceSample/build.gradle +++ b/ui/espresso/IdlingResourceSample/build.gradle @@ -21,7 +21,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -35,14 +36,15 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" espressoVersion = "3.6.0-alpha01" diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle index 5dab6764a..d87c4b305 100644 --- a/ui/espresso/IntentsAdvancedSample/app/build.gradle +++ b/ui/espresso/IntentsAdvancedSample/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.intents.AdvancedSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle index a8cbd38c4..875a092e1 100644 --- a/ui/espresso/IntentsAdvancedSample/build.gradle +++ b/ui/espresso/IntentsAdvancedSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,14 +20,15 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { buildToolsVersion = "32.0.0" androidxAnnotationVersion = "1.5.0" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle index 2984e925b..a9b9331b7 100644 --- a/ui/espresso/IntentsBasicSample/app/build.gradle +++ b/ui/espresso/IntentsBasicSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.IntentsBasicSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle index 0d1923071..c75f10711 100644 --- a/ui/espresso/IntentsBasicSample/build.gradle +++ b/ui/espresso/IntentsBasicSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,14 +20,15 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { androidxAnnotationVersion = "1.5.0" androidxCoreVersion = "1.9.0" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/MultiProcessSample/app/build.gradle b/ui/espresso/MultiProcessSample/app/build.gradle index ed42da4dd..5f1226b42 100644 --- a/ui/espresso/MultiProcessSample/app/build.gradle +++ b/ui/espresso/MultiProcessSample/app/build.gradle @@ -20,7 +20,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.multiprocesssample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle index e9647bf50..b8d399d90 100644 --- a/ui/espresso/MultiProcessSample/build.gradle +++ b/ui/espresso/MultiProcessSample/build.gradle @@ -21,7 +21,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -35,7 +36,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -45,7 +47,7 @@ task clean(type: Delete) { ext { androidxAnnotationVersion = "1.5.0" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/MultiWindowSample/app/build.gradle b/ui/espresso/MultiWindowSample/app/build.gradle index 1e29bf357..243bddfbf 100644 --- a/ui/espresso/MultiWindowSample/app/build.gradle +++ b/ui/espresso/MultiWindowSample/app/build.gradle @@ -5,7 +5,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.MultiWindowSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle index a50f10344..51443c5e0 100644 --- a/ui/espresso/MultiWindowSample/build.gradle +++ b/ui/espresso/MultiWindowSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,7 +20,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -27,7 +29,7 @@ ext { buildToolsVersion = "32.0.0" androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/RecyclerViewSample/app/build.gradle b/ui/espresso/RecyclerViewSample/app/build.gradle index 47feee503..391627aa3 100644 --- a/ui/espresso/RecyclerViewSample/app/build.gradle +++ b/ui/espresso/RecyclerViewSample/app/build.gradle @@ -20,7 +20,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.RecyclerViewSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle index d1e81d3bf..b50f14ce0 100644 --- a/ui/espresso/RecyclerViewSample/build.gradle +++ b/ui/espresso/RecyclerViewSample/build.gradle @@ -21,7 +21,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -35,7 +36,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -43,7 +45,7 @@ ext { androidxAnnotationVersion = "1.5.0" androidxRecyclerVersion = "1.2.1" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle index 321cf0319..a3c5bdb85 100644 --- a/ui/espresso/ScreenshotSample/build.gradle +++ b/ui/espresso/ScreenshotSample/build.gradle @@ -5,7 +5,7 @@ buildscript { ext.androidxCoreVersion = "1.9.0" ext.buildToolsVersion = "32.0.0" ext.androidxCompatVersion = "1.5.1" - ext.coreVersion = "1.6.0-alpha01" + ext.coreVersion = "1.6.0-alpha02" ext.extJUnitVersion = "1.2.0-alpha01" ext.runnerVersion = "1.6.0-alpha03" ext.rulesVersion = "1.6.0-alpha01" @@ -15,7 +15,8 @@ buildscript { repositories { google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle index c4c0fa995..6b63fed86 100644 --- a/ui/espresso/WebBasicSample/app/build.gradle +++ b/ui/espresso/WebBasicSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.espresso.web.BasicSample" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle index e7c371b86..88f591181 100644 --- a/ui/espresso/WebBasicSample/build.gradle +++ b/ui/espresso/WebBasicSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,14 +20,15 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } ext { androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/ui/uiautomator/BasicSample/app/build.gradle b/ui/uiautomator/BasicSample/app/build.gradle index b3f6e0be5..a49deadcc 100644 --- a/ui/uiautomator/BasicSample/app/build.gradle +++ b/ui/uiautomator/BasicSample/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdk 33 defaultConfig { applicationId "com.example.android.testing.uiautomator.BasicSample" - minSdkVersion 18 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle index 047575f82..189c34ee2 100644 --- a/ui/uiautomator/BasicSample/build.gradle +++ b/ui/uiautomator/BasicSample/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -16,7 +17,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } @@ -24,7 +26,7 @@ ext { buildToolsVersion = "32.0.0" androidxAnnotationVersion = "1.5.0" guavaVersion = "31.1-android" - coreVersion = "1.6.0-alpha01" + coreVersion = "1.6.0-alpha02" extJUnitVersion = "1.2.0-alpha01" runnerVersion = "1.6.0-alpha03" rulesVersion = "1.6.0-alpha01" diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle index ada2e810f..818ff005b 100644 --- a/unit/BasicNativeAndroidTest/build.gradle +++ b/unit/BasicNativeAndroidTest/build.gradle @@ -5,7 +5,7 @@ buildscript { ext.androidxCoreVersion = "1.9.0" ext.buildToolsVersion = "32.0.0" ext.androidxCompatVersion = "1.5.1" - ext.coreVersion = "1.6.0-alpha01" + ext.coreVersion = "1.6.0-alpha02" ext.extJUnitVersion = "1.2.0-alpha01" ext.runnerVersion = "1.6.0-alpha03" ext.rulesVersion = "1.6.0-alpha01" @@ -18,7 +18,8 @@ buildscript { repositories { google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" diff --git a/unit/BasicSample-kotlinApp/app/build.gradle b/unit/BasicSample-kotlinApp/app/build.gradle index 6f7985560..7a7c0a1cb 100644 --- a/unit/BasicSample-kotlinApp/app/build.gradle +++ b/unit/BasicSample-kotlinApp/app/build.gradle @@ -8,7 +8,7 @@ android { compileSdkVersion 27 defaultConfig { applicationId "com.example.android.testing.unittesting.BasicSample" - minSdkVersion 14 + minSdkVersion 19 versionCode 1 versionName "1.0" targetSdkVersion 27 diff --git a/unit/BasicSample-kotlinApp/build.gradle b/unit/BasicSample-kotlinApp/build.gradle index 683dc0b55..81c919e9c 100644 --- a/unit/BasicSample-kotlinApp/build.gradle +++ b/unit/BasicSample-kotlinApp/build.gradle @@ -4,7 +4,8 @@ buildscript { } repositories { google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:3.5.2" @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { google() - mavenCentral() + mavenCentral() + mavenLocal() } } diff --git a/unit/BasicSample/app/build.gradle b/unit/BasicSample/app/build.gradle index 93dc98147..9007bd2fb 100644 --- a/unit/BasicSample/app/build.gradle +++ b/unit/BasicSample/app/build.gradle @@ -21,7 +21,7 @@ android { buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.unittesting.BasicSample" - minSdkVersion 14 + minSdkVersion 19 versionCode 1 versionName "1.0" targetSdkVersion 30 diff --git a/unit/BasicSample/build.gradle b/unit/BasicSample/build.gradle index 772c3d2a6..b4fe391eb 100644 --- a/unit/BasicSample/build.gradle +++ b/unit/BasicSample/build.gradle @@ -20,7 +20,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -34,7 +35,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } diff --git a/unit/BasicUnitAndroidTest/app/build.gradle b/unit/BasicUnitAndroidTest/app/build.gradle index 914ddce7d..344f01847 100644 --- a/unit/BasicUnitAndroidTest/app/build.gradle +++ b/unit/BasicUnitAndroidTest/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "com.example.android.testing.unittesting.basicunitandroidtest" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/build.gradle index 2dc4855b8..81d1f27b8 100644 --- a/unit/BasicUnitAndroidTest/build.gradle +++ b/unit/BasicUnitAndroidTest/build.gradle @@ -5,7 +5,8 @@ buildscript { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } dependencies { classpath "com.android.tools.build:gradle:$agpVersion" @@ -19,7 +20,8 @@ allprojects { repositories { // Insert local test repo here google() - mavenCentral() + mavenCentral() + mavenLocal() } } diff --git a/update_versions.sh b/update_versions.sh index e5a61796f..81dcd2da3 100755 --- a/update_versions.sh +++ b/update_versions.sh @@ -21,15 +21,15 @@ 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 +monitorVersion="1.7.0-alpha02" # 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 +coreVersion="1.6.0-alpha02" # 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 +espressoDeviceVersion="1.0.0-alpha05" # ESPRESSO_DEVICE_VERSION robolectricVersion="4.10.3" uiAutomatorVersion="2.2.0" # UIAUTOMATOR_VERSION