From 7e0f864438eaf692be57416bc3e76361821907ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Tue, 3 Dec 2024 15:31:35 +0000 Subject: [PATCH] Bumps Android SDKs to 21->35 --- integration/ServiceTestRuleSample/app/build.gradle | 4 ++-- runner/AndroidJunitRunnerSample/app/build.gradle | 4 ++-- runner/AndroidTestOrchestratorSample/app/build.gradle | 4 ++-- .../app/build.gradle | 6 +++--- ui/PreviewScreenshot/app/build.gradle.kts | 4 ++-- ui/espresso/AccessibilitySample/app/build.gradle | 4 ++-- ui/espresso/BasicSample/app/build.gradle | 4 ++-- ui/espresso/CustomMatcherSample/app/build.gradle | 4 ++-- ui/espresso/DataAdapterSample/app/build.gradle | 4 ++-- ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml | 2 +- ui/espresso/EspressoDeviceSample/app/build.gradle | 4 ++-- ui/espresso/FragmentScenarioSample/app/build.gradle | 4 ++-- ui/espresso/IdlingResourceSample/app/build.gradle | 4 ++-- ui/espresso/IntentsAdvancedSample/app/build.gradle | 4 ++-- ui/espresso/IntentsBasicSample/app/build.gradle | 4 ++-- ui/espresso/MultiProcessSample/app/build.gradle | 4 ++-- ui/espresso/MultiWindowSample/app/build.gradle | 4 ++-- ui/espresso/RecyclerViewSample/app/build.gradle | 4 ++-- ui/espresso/ScreenshotSample/app/build.gradle | 6 +++--- ui/espresso/WebBasicSample/app/build.gradle | 4 ++-- ui/uiautomator/BasicSample/app/build.gradle | 4 ++-- unit/BasicNativeAndroidTest/app/build.gradle | 6 +++--- unit/BasicNativeAndroidTest/build.gradle | 2 +- unit/BasicSample-kotlinApp/app/build.gradle | 6 +++--- unit/BasicSample/app/build.gradle | 6 +++--- 25 files changed, 53 insertions(+), 53 deletions(-) diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle index 5d2f7c613..eff9e23ff 100644 --- a/integration/ServiceTestRuleSample/app/build.gradle +++ b/integration/ServiceTestRuleSample/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: "com.android.application" android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle index 072763155..445c1e47e 100644 --- a/runner/AndroidJunitRunnerSample/app/build.gradle +++ b/runner/AndroidJunitRunnerSample/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: "com.android.application" android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.androidjunitrunnersample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/runner/AndroidTestOrchestratorSample/app/build.gradle b/runner/AndroidTestOrchestratorSample/app/build.gradle index ddd122498..8b9ffcbff 100644 --- a/runner/AndroidTestOrchestratorSample/app/build.gradle +++ b/runner/AndroidTestOrchestratorSample/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: "com.android.application" android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.androidtestorchestratorsample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle index ae0284998..75db58363 100644 --- a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle +++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.androidtestorchestratorsample" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/PreviewScreenshot/app/build.gradle.kts b/ui/PreviewScreenshot/app/build.gradle.kts index 32497ca2b..ab74d1500 100644 --- a/ui/PreviewScreenshot/app/build.gradle.kts +++ b/ui/PreviewScreenshot/app/build.gradle.kts @@ -22,12 +22,12 @@ plugins { android { namespace = "com.example.compose.previewscreenshot" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.example.compose.previewscreenshot" minSdk = 24 - targetSdk = 34 + targetSdk = 35 versionCode = 1 versionName = "1.0" diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle index 1e2025d4e..abf2b1a93 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.AccessibilitySample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle index 13ea92dba..044fefc91 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.BasicSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/CustomMatcherSample/app/build.gradle b/ui/espresso/CustomMatcherSample/app/build.gradle index 0774be6bf..f3b3fcf80 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.CustomMatcherSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/DataAdapterSample/app/build.gradle b/ui/espresso/DataAdapterSample/app/build.gradle index 35076625c..77e7b93b8 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.DataAdapterSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml b/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml index bdceefb5b..e32c40d97 100644 --- a/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml +++ b/ui/espresso/DataAdapterSample/app/src/main/AppManifest.xml @@ -17,6 +17,6 @@ - + diff --git a/ui/espresso/EspressoDeviceSample/app/build.gradle b/ui/espresso/EspressoDeviceSample/app/build.gradle index dfb8f8202..52627ca1f 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.EspressoDeviceSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/FragmentScenarioSample/app/build.gradle b/ui/espresso/FragmentScenarioSample/app/build.gradle index 0d6abaa88..853a6629d 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.FragmentScenarioSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/IdlingResourceSample/app/build.gradle b/ui/espresso/IdlingResourceSample/app/build.gradle index 4da492c38..12f786436 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.IdlingResourceSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle index 24df560a1..9a6a7d9a8 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 33 + compileSdkVersion 35 buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.intents.AdvancedSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle index 08cca1c84..cb6f9e93c 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.IntentsBasicSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/MultiProcessSample/app/build.gradle b/ui/espresso/MultiProcessSample/app/build.gradle index 93cbb4b53..01553a517 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.multiprocesssample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/MultiWindowSample/app/build.gradle b/ui/espresso/MultiWindowSample/app/build.gradle index c3653ba44..7dbbafecb 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.MultiWindowSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/RecyclerViewSample/app/build.gradle b/ui/espresso/RecyclerViewSample/app/build.gradle index 498d3fb96..4c5a0d2b6 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.RecyclerViewSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/ScreenshotSample/app/build.gradle b/ui/espresso/ScreenshotSample/app/build.gradle index e2afbeb5f..f512a07b7 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.screenshotsample" - minSdk 19 - targetSdkVersion 34 + minSdk 21 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle index 6c79f8355..5132eb013 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.espresso.web.BasicSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/ui/uiautomator/BasicSample/app/build.gradle b/ui/uiautomator/BasicSample/app/build.gradle index 2f256a12d..4104ba0db 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 34 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.uiautomator.BasicSample" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" diff --git a/unit/BasicNativeAndroidTest/app/build.gradle b/unit/BasicNativeAndroidTest/app/build.gradle index bc4c1c1a3..31aef5233 100644 --- a/unit/BasicNativeAndroidTest/app/build.gradle +++ b/unit/BasicNativeAndroidTest/app/build.gradle @@ -5,12 +5,12 @@ plugins { apply plugin: "kotlin-android" android { - compileSdk 33 + compileSdk 35 defaultConfig { applicationId "com.example.android.testing.nativesample" - minSdk 18 - targetSdk 33 + minSdk 21 + targetSdk 35 versionCode 1 versionName "1.0" diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle index c2dc21423..e574132c9 100644 --- a/unit/BasicNativeAndroidTest/build.gradle +++ b/unit/BasicNativeAndroidTest/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.7.3" - ext.kotlinVersion = "1.7.10" + ext.kotlinVersion = "2.1.0" ext.androidxCoreVersion = "1.9.0" ext.buildToolsVersion = "32.0.0" ext.androidxCompatVersion = "1.5.1" diff --git a/unit/BasicSample-kotlinApp/app/build.gradle b/unit/BasicSample-kotlinApp/app/build.gradle index 862fbfdb4..d7a43b912 100644 --- a/unit/BasicSample-kotlinApp/app/build.gradle +++ b/unit/BasicSample-kotlinApp/app/build.gradle @@ -5,13 +5,13 @@ apply plugin: "kotlin-android" apply plugin: "kotlin-android-extensions" android { - compileSdkVersion 27 + compileSdkVersion 35 defaultConfig { applicationId "com.example.android.testing.unittesting.BasicSample" - minSdkVersion 14 + minSdkVersion 21 versionCode 1 versionName "1.0" - targetSdkVersion 27 + targetSdkVersion 35 } } diff --git a/unit/BasicSample/app/build.gradle b/unit/BasicSample/app/build.gradle index 93dc98147..b659be89c 100644 --- a/unit/BasicSample/app/build.gradle +++ b/unit/BasicSample/app/build.gradle @@ -17,14 +17,14 @@ apply plugin: "com.android.application" android { - compileSdkVersion 30 + compileSdkVersion 35 buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.unittesting.BasicSample" - minSdkVersion 14 + minSdkVersion 21 versionCode 1 versionName "1.0" - targetSdkVersion 30 + targetSdkVersion 35 } productFlavors { }