From b2678b596c2df46b2db02740b68bb01e40825a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Wed, 27 Aug 2025 14:13:43 +0200 Subject: [PATCH] Add missing projects to `projects.conf` The following projects were missing from the `projects.conf` file, so they were not updated when running `update_versions.sh`: - `runner/AndroidTestOrchestratorWithTestCoverageSample` - `unit/BasicSample` - `unit/BasicSample-kotlinApp` - `unit/BasicUnitAndroidTest` --- projects.conf | 6 +++++- .../app/build.gradle | 6 +++--- .../build.gradle | 18 +++++++++--------- .../IntentsAdvancedSample/app/build.gradle | 2 +- unit/BasicSample-kotlinApp/app/build.gradle | 6 +++--- unit/BasicSample-kotlinApp/build.gradle | 5 +++-- unit/BasicSample/app/build.gradle | 6 +++--- unit/BasicSample/build.gradle | 2 +- unit/BasicUnitAndroidTest/app/build.gradle | 6 +++--- unit/BasicUnitAndroidTest/build.gradle | 10 +++++----- 10 files changed, 36 insertions(+), 31 deletions(-) diff --git a/projects.conf b/projects.conf index f9b14cdb2..f90c38e7d 100644 --- a/projects.conf +++ b/projects.conf @@ -1,6 +1,7 @@ integration/ServiceTestRuleSample runner/AndroidJunitRunnerSample runner/AndroidTestOrchestratorSample +runner/AndroidTestOrchestratorWithTestCoverageSample ui/espresso/AccessibilitySample ui/espresso/BasicSample ui/espresso/CustomMatcherSample @@ -10,10 +11,13 @@ ui/espresso/FragmentScenarioSample ui/espresso/IdlingResourceSample ui/espresso/IntentsAdvancedSample ui/espresso/IntentsBasicSample -ui/espresso/MultiWindowSample ui/espresso/MultiProcessSample +ui/espresso/MultiWindowSample ui/espresso/RecyclerViewSample ui/espresso/ScreenshotSample ui/espresso/WebBasicSample ui/uiautomator/BasicSample unit/BasicNativeAndroidTest +unit/BasicSample +unit/BasicSample-kotlinApp +unit/BasicUnitAndroidTest diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle index ae0284998..abcdf8b81 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 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/AndroidTestOrchestratorWithTestCoverageSample/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle index 9ddb36c16..4cbcc7055 100644 --- a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle +++ b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.agpVersion = "8.1.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -24,14 +24,14 @@ allprojects { } ext { - androidxAnnotationVersion = "1.2.0" - guavaVersion = "30.1.1-android" - coreVersion = "1.6.0-alpha01" - extJUnitVersion = "1.2.0-alpha01" - runnerVersion = "1.6.0-alpha03" - rulesVersion = "1.6.0-alpha01" + androidxAnnotationVersion = "1.5.0" + guavaVersion = "31.1-android" + coreVersion = "1.6.1" + extJUnitVersion = "1.2.1" + runnerVersion = "1.6.1" + rulesVersion = "1.6.1" testServicesVersion = "1.5.0-alpha01" - orchestratorVersion = "1.5.0-alpha01" - espressoVersion = "3.6.0-alpha01" + orchestratorVersion = "1.5.0" + espressoVersion = "3.6.1" truthVersion = "1.1.3" } diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle index 24df560a1..09303342f 100644 --- a/ui/espresso/IntentsAdvancedSample/app/build.gradle +++ b/ui/espresso/IntentsAdvancedSample/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: "com.android.application" android { - compileSdkVersion 33 + compileSdk 34 buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.intents.AdvancedSample" diff --git a/unit/BasicSample-kotlinApp/app/build.gradle b/unit/BasicSample-kotlinApp/app/build.gradle index 6f7985560..0ceaaf2cc 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 + compileSdk 34 defaultConfig { applicationId "com.example.android.testing.unittesting.BasicSample" - minSdkVersion 14 + minSdkVersion 21 versionCode 1 versionName "1.0" - targetSdkVersion 27 + targetSdkVersion 34 } } diff --git a/unit/BasicSample-kotlinApp/build.gradle b/unit/BasicSample-kotlinApp/build.gradle index 683dc0b55..70e5a6cdc 100644 --- a/unit/BasicSample-kotlinApp/build.gradle +++ b/unit/BasicSample-kotlinApp/build.gradle @@ -1,13 +1,14 @@ buildscript { ext { - kotlinVersion = "1.3.61" + agpVersion = "8.5.0" + kotlinVersion = "1.9.22" } repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:3.5.2" + classpath "com.android.tools.build:gradle:$agpVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/unit/BasicSample/app/build.gradle b/unit/BasicSample/app/build.gradle index 93dc98147..45d28d739 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 + compileSdk 34 buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.unittesting.BasicSample" - minSdkVersion 14 + minSdkVersion 21 versionCode 1 versionName "1.0" - targetSdkVersion 30 + targetSdkVersion 34 } productFlavors { } diff --git a/unit/BasicSample/build.gradle b/unit/BasicSample/build.gradle index 772c3d2a6..2e06618bd 100644 --- a/unit/BasicSample/build.gradle +++ b/unit/BasicSample/build.gradle @@ -16,7 +16,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.agpVersion = "7.3.0-alpha07" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() diff --git a/unit/BasicUnitAndroidTest/app/build.gradle b/unit/BasicUnitAndroidTest/app/build.gradle index 914ddce7d..8c6880cb0 100644 --- a/unit/BasicUnitAndroidTest/app/build.gradle +++ b/unit/BasicUnitAndroidTest/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: "com.android.application" android { - compileSdk 33 + compileSdk 34 buildToolsVersion = rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.unittesting.basicunitandroidtest" - minSdkVersion 14 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/build.gradle index 2dc4855b8..a4862ae1e 100644 --- a/unit/BasicUnitAndroidTest/build.gradle +++ b/unit/BasicUnitAndroidTest/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.agpVersion = "8.1.1" + ext.agpVersion = "8.5.0" repositories { // Insert local test repo here google() @@ -25,10 +25,10 @@ allprojects { ext { buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" - coreVersion = "1.5.0" - extJUnitVersion = "1.1.4" - runnerVersion = "1.5.0" + androidxAnnotationVersion = "1.5.0" + coreVersion = "1.6.1" + extJUnitVersion = "1.2.1" + runnerVersion = "1.6.1" hamcrestVersion = "1.3" truthVersion = "1.1.3" }