diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle index 8171699b3..2b7c32968 100644 --- a/integration/ServiceTestRuleSample/app/build.gradle +++ b/integration/ServiceTestRuleSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle index 648bb34da..67a0cd325 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,7 +24,7 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" + buildToolsVersion = "32.0.0" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" runnerVersion = "1.5.0-alpha04" diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle index 61000bc9e..d7cc130cb 100644 --- a/runner/AndroidJunitRunnerSample/app/build.gradle +++ b/runner/AndroidJunitRunnerSample/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.androidjunitrunnersample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/runner/AndroidJunitRunnerSample/app/src/main/AndroidManifest.xml b/runner/AndroidJunitRunnerSample/app/src/main/AndroidManifest.xml index ed5bc18ae..dec55e4e5 100644 --- a/runner/AndroidJunitRunnerSample/app/src/main/AndroidManifest.xml +++ b/runner/AndroidJunitRunnerSample/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle index 90f9d0f00..6ae1f841e 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,8 +24,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/runner/AndroidTestOrchestratorSample/app/build.gradle b/runner/AndroidTestOrchestratorSample/app/build.gradle index 9e027f5ef..632b447ef 100644 --- a/runner/AndroidTestOrchestratorSample/app/build.gradle +++ b/runner/AndroidTestOrchestratorSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.androidtestorchestratorsample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/runner/AndroidTestOrchestratorSample/app/src/main/AndroidManifest.xml b/runner/AndroidTestOrchestratorSample/app/src/main/AndroidManifest.xml index 2561a31af..6d627ff4f 100644 --- a/runner/AndroidTestOrchestratorSample/app/src/main/AndroidManifest.xml +++ b/runner/AndroidTestOrchestratorSample/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle index 93f5a4e58..065ab444d 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,8 +24,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle index 8a1b36f51..a40bbe1ac 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 = '7.1.1' + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -32,6 +32,7 @@ ext { runnerVersion = "1.4.1-alpha03" rulesVersion = "1.4.1-alpha03" testServicesVersion = "1.4.1-alpha03" + orchestratorVersion = "1.4.1-alpha03" espressoVersion = "3.5.0-alpha03" truthVersion = "1.1.3" } diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties index a70d5d4e4..87d3f3f83 100644 --- a/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties +++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 14 15:41:28 PDT 2021 +#Wed Jun 01 11:09:45 PDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle index 6080ed6ac..811c92c53 100644 --- a/ui/espresso/AccessibilitySample/app/build.gradle +++ b/ui/espresso/AccessibilitySample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.AccessibilitySample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/AccessibilitySample/app/src/main/AndroidManifest.xml b/ui/espresso/AccessibilitySample/app/src/main/AndroidManifest.xml index 6bbeee916..8bf3393b6 100644 --- a/ui/espresso/AccessibilitySample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/AccessibilitySample/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle index 1b0d25996..9f0c8d859 100644 --- a/ui/espresso/AccessibilitySample/build.gradle +++ b/ui/espresso/AccessibilitySample/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlinVersion = "1.6.21" - ext.agpVersion = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -26,8 +26,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" robolectricVersion = "4.8.1" extTruthVersion = "1.5.0-alpha07" coreVersion = "1.4.1-alpha07" diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle index c028ee662..9f3e39ead 100644 --- a/ui/espresso/BasicSample/app/build.gradle +++ b/ui/espresso/BasicSample/app/build.gradle @@ -5,12 +5,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.BasicSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/BasicSample/app/src/main/AndroidManifest.xml b/ui/espresso/BasicSample/app/src/main/AndroidManifest.xml index 54b6a1ede..1c62e16a9 100644 --- a/ui/espresso/BasicSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/BasicSample/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle index cfb687abe..484c0c9d4 100644 --- a/ui/espresso/BasicSample/build.gradle +++ b/ui/espresso/BasicSample/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlinVersion = "1.6.21" - ext.agpVersion = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -26,8 +26,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" robolectricVersion = "4.8.1" guavaVersion = "30.1.1-android" extTruthVersion = "1.5.0-alpha07" diff --git a/ui/espresso/BasicSampleBundled/AndroidManifest.xml b/ui/espresso/BasicSampleBundled/AndroidManifest.xml index 080643c0e..6d45868e7 100644 --- a/ui/espresso/BasicSampleBundled/AndroidManifest.xml +++ b/ui/espresso/BasicSampleBundled/AndroidManifest.xml @@ -14,7 +14,8 @@ + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/CustomMatcherSample/app/build.gradle b/ui/espresso/CustomMatcherSample/app/build.gradle index f344b7d84..150a55b1c 100644 --- a/ui/espresso/CustomMatcherSample/app/build.gradle +++ b/ui/espresso/CustomMatcherSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.CustomMatcherSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml b/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml index 966dcd8ff..1809e01ee 100644 --- a/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/CustomMatcherSample/app/src/main/AndroidManifest.xml @@ -8,7 +8,8 @@ android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle index a7d681d85..c2b32066f 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,8 +24,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/ui/espresso/DataAdapterSample/app/build.gradle b/ui/espresso/DataAdapterSample/app/build.gradle index d5b5389da..a3059d726 100644 --- a/ui/espresso/DataAdapterSample/app/build.gradle +++ b/ui/espresso/DataAdapterSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.DataAdapterSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/DataAdapterSample/app/src/main/AndroidManifest.xml b/ui/espresso/DataAdapterSample/app/src/main/AndroidManifest.xml index 0c38d7723..70ec99c59 100644 --- a/ui/espresso/DataAdapterSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/DataAdapterSample/app/src/main/AndroidManifest.xml @@ -23,7 +23,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle index cd8becda0..f136ae085 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,8 +24,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/ui/espresso/FragmentScenarioSample/app/build.gradle b/ui/espresso/FragmentScenarioSample/app/build.gradle index 76214d1e1..4f8f422b4 100644 --- a/ui/espresso/FragmentScenarioSample/app/build.gradle +++ b/ui/espresso/FragmentScenarioSample/app/build.gradle @@ -5,11 +5,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 30 + compileSdkVersion 32 defaultConfig { applicationId "com.example.android.testing.espresso.FragmentScenarioSample" minSdkVersion 15 - targetSdkVersion 30 + targetSdkVersion 32 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 a8b3f7852..08c72e65f 100644 --- a/ui/espresso/FragmentScenarioSample/build.gradle +++ b/ui/espresso/FragmentScenarioSample/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlinVersion = "1.6.21" - ext.agpVersion = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { google() mavenCentral() @@ -27,10 +27,10 @@ task clean(type: Delete) { } ext { - buildToolsVersion = "31.0.0" - androidxCoreVersion = "1.6.0" - androidxCompatVersion = "1.3.1" - androidxFragmentVersion = "1.3.6" + buildToolsVersion = "32.0.0" + androidxCoreVersion = "1.7.0" + androidxCompatVersion = "1.4.1" + androidxFragmentVersion = "1.4.1" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" runnerVersion = "1.5.0-alpha04" diff --git a/ui/espresso/IdlingResourceSample/app/build.gradle b/ui/espresso/IdlingResourceSample/app/build.gradle index d70aef9f8..2f3019987 100644 --- a/ui/espresso/IdlingResourceSample/app/build.gradle +++ b/ui/espresso/IdlingResourceSample/app/build.gradle @@ -17,13 +17,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.IdlingResourceSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IdlingResourceSample/app/src/main/AndroidManifest.xml b/ui/espresso/IdlingResourceSample/app/src/main/AndroidManifest.xml index 91532003e..ff1467d20 100644 --- a/ui/espresso/IdlingResourceSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/IdlingResourceSample/app/src/main/AndroidManifest.xml @@ -22,7 +22,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle index 50504a9e4..9559306fd 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.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -40,8 +40,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle index e3442656b..d5ff66fe9 100644 --- a/ui/espresso/IntentsAdvancedSample/app/build.gradle +++ b/ui/espresso/IntentsAdvancedSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.intents.AdvancedSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsAdvancedSample/app/src/main/AndroidManifest.xml b/ui/espresso/IntentsAdvancedSample/app/src/main/AndroidManifest.xml index b0be0e777..abb00c790 100644 --- a/ui/espresso/IntentsAdvancedSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/IntentsAdvancedSample/app/src/main/AndroidManifest.xml @@ -28,7 +28,8 @@ android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle index 66a762592..c2a3cabd7 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,8 +24,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" runnerVersion = "1.5.0-alpha04" diff --git a/ui/espresso/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle index 8c9a1ff0a..231206948 100644 --- a/ui/espresso/IntentsBasicSample/app/build.gradle +++ b/ui/espresso/IntentsBasicSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.IntentsBasicSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml b/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml index ea1230fb8..b24fe241f 100644 --- a/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/IntentsBasicSample/app/src/main/AndroidManifest.xml @@ -26,7 +26,8 @@ android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle index a92290a0e..15e765338 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.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,9 +24,9 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" - androidxCoreVersion = "1.6.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" + androidxCoreVersion = "1.7.0" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" runnerVersion = "1.5.0-alpha04" diff --git a/ui/espresso/MultiProcessSample/app/build.gradle b/ui/espresso/MultiProcessSample/app/build.gradle index d968669a2..2f5c33753 100644 --- a/ui/espresso/MultiProcessSample/app/build.gradle +++ b/ui/espresso/MultiProcessSample/app/build.gradle @@ -17,12 +17,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.multiprocesssample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/MultiProcessSample/app/src/main/AndroidManifest.xml b/ui/espresso/MultiProcessSample/app/src/main/AndroidManifest.xml index 2bdc233bb..5ae41b90d 100644 --- a/ui/espresso/MultiProcessSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/MultiProcessSample/app/src/main/AndroidManifest.xml @@ -25,7 +25,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + @@ -36,4 +37,4 @@ android:process=":PID2">> - \ No newline at end of file + diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle index 3c1627492..7539d1d77 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -44,8 +44,8 @@ task clean(type: Delete) { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" runnerVersion = "1.5.0-alpha04" diff --git a/ui/espresso/MultiWindowSample/app/build.gradle b/ui/espresso/MultiWindowSample/app/build.gradle index d6da01f76..8e7ee0747 100644 --- a/ui/espresso/MultiWindowSample/app/build.gradle +++ b/ui/espresso/MultiWindowSample/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.MultiWindowSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/MultiWindowSample/app/src/main/AndroidManifest.xml b/ui/espresso/MultiWindowSample/app/src/main/AndroidManifest.xml index 61e99df72..09eb8a6bc 100644 --- a/ui/espresso/MultiWindowSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/MultiWindowSample/app/src/main/AndroidManifest.xml @@ -8,7 +8,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle index 1f7e12465..64ad3e5e1 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,8 +24,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/ui/espresso/RecyclerViewSample/app/build.gradle b/ui/espresso/RecyclerViewSample/app/build.gradle index ccc0158a6..4b63d45cc 100644 --- a/ui/espresso/RecyclerViewSample/app/build.gradle +++ b/ui/espresso/RecyclerViewSample/app/build.gradle @@ -17,12 +17,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.RecyclerViewSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/RecyclerViewSample/app/src/main/AndroidManifest.xml b/ui/espresso/RecyclerViewSample/app/src/main/AndroidManifest.xml index 19fe9755a..fa233af28 100644 --- a/ui/espresso/RecyclerViewSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/RecyclerViewSample/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle index 6204afb04..01a34e748 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -40,8 +40,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" androidxRecyclerVersion = "1.2.1" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle index f5a4f0b86..49fd6a3e0 100644 --- a/ui/espresso/ScreenshotSample/build.gradle +++ b/ui/espresso/ScreenshotSample/build.gradle @@ -1,10 +1,10 @@ // 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 = "7.3.0-beta01" ext.kotlinVersion = "1.6.21" - ext.androidxCoreVersion = "1.6.0" - ext.buildToolsVersion = "31.0.0" - ext.androidxCompatVersion = "1.3.1" + ext.androidxCoreVersion = "1.7.0" + ext.buildToolsVersion = "32.0.0" + ext.androidxCompatVersion = "1.4.1" ext.coreVersion = "1.4.1-alpha07" ext.extJUnitVersion = "1.1.4-alpha07" ext.runnerVersion = "1.5.0-alpha04" diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle index 06f6b6c2b..f620478e5 100644 --- a/ui/espresso/WebBasicSample/app/build.gradle +++ b/ui/espresso/WebBasicSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.web.BasicSample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/espresso/WebBasicSample/app/src/main/AndroidManifest.xml b/ui/espresso/WebBasicSample/app/src/main/AndroidManifest.xml index e984e7495..74a473683 100644 --- a/ui/espresso/WebBasicSample/app/src/main/AndroidManifest.xml +++ b/ui/espresso/WebBasicSample/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle index 59edc28c3..0db50e718 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -24,8 +24,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/ui/uiautomator/BasicSample/app/build.gradle b/ui/uiautomator/BasicSample/app/build.gradle index cb0c6372b..1ba7b65e1 100644 --- a/ui/uiautomator/BasicSample/app/build.gradle +++ b/ui/uiautomator/BasicSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.uiautomator.BasicSample" minSdkVersion 18 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml b/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml index ad9335b8f..f47abb39f 100644 --- a/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml +++ b/ui/uiautomator/BasicSample/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true" > diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle index 683e19d58..9af5458e7 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 = "7.3.0-alpha07" + ext.agpVersion = "7.3.0-beta01" repositories { // Insert local test repo here google() @@ -21,8 +21,8 @@ allprojects { } ext { - buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" + buildToolsVersion = "32.0.0" + androidxAnnotationVersion = "1.3.0" guavaVersion = "30.1.1-android" coreVersion = "1.4.1-alpha07" extJUnitVersion = "1.1.4-alpha07" diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle index 3a668ff92..8d68d269c 100644 --- a/unit/BasicNativeAndroidTest/build.gradle +++ b/unit/BasicNativeAndroidTest/build.gradle @@ -1,10 +1,10 @@ // 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 = "7.3.0-beta01" ext.kotlinVersion = "1.6.21" - ext.androidxCoreVersion = "1.6.0" - ext.buildToolsVersion = "31.0.0" - ext.androidxCompatVersion = "1.3.1" + ext.androidxCoreVersion = "1.7.0" + ext.buildToolsVersion = "32.0.0" + ext.androidxCompatVersion = "1.4.1" ext.coreVersion = "1.4.1-alpha07" ext.extJUnitVersion = "1.1.4-alpha07" ext.runnerVersion = "1.5.0-alpha04" diff --git a/update_versions.sh b/update_versions.sh index ae3b3ea39..3e390a0a1 100755 --- a/update_versions.sh +++ b/update_versions.sh @@ -9,15 +9,15 @@ 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="31.0.0" -agpVersion="7.3.0-alpha07" +buildToolsVersion="32.0.0" +agpVersion="7.3.0-beta01" kotlinVersion="1.6.21" # KOTLIN_VERSION -compileSdkVersion="30" -targetSdkVersion="30" -androidxAnnotationVersion="1.2.0" # ANDROIDX_ANNOTATION_VERSION -androidxCompatVersion="1.3.1" # ANDROIDX_COMPAT_VERSION -androidxCoreVersion="1.6.0" # ANDROIDX_CORE_VERSION -androidxFragmentVersion="1.3.6" # ANDROIDX_FRAGMENT_VERSION +compileSdkVersion="32" +targetSdkVersion="32" +androidxAnnotationVersion="1.3.0" # ANDROIDX_ANNOTATION_VERSION +androidxCompatVersion="1.4.1" # ANDROIDX_COMPAT_VERSION +androidxCoreVersion="1.7.0" # ANDROIDX_CORE_VERSION +androidxFragmentVersion="1.4.1" # ANDROIDX_FRAGMENT_VERSION androidxRecyclerVersion="1.2.1" # ANDROIDX_RECYCLERVIEW_VERSION guavaVersion="30.1.1-android" # GUAVA_VERSION truthVersion="1.1.3" # TRUTH_VERSION