Skip to content

Commit ee515c8

Browse files
brettchabotbrettchabot
committed
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
1 parent 8def210 commit ee515c8

File tree

58 files changed

+213
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+213
-211
lines changed

‎integration/ServiceTestRuleSample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: "com.android.application"
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
defaultConfig {
66
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
7-
minSdkVersion 14
8-
targetSdkVersion 33
7+
minSdkVersion 21
8+
targetSdkVersion 34
99
versionCode 1
1010
versionName "1.0"
1111

‎integration/ServiceTestRuleSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -24,8 +24,8 @@ allprojects {
2424
}
2525

2626
ext {
27-
coreVersion = "1.6.0-alpha01"
28-
extJUnitVersion = "1.2.0-alpha01"
29-
runnerVersion = "1.6.0-alpha03"
30-
rulesVersion = "1.6.0-alpha01"
27+
coreVersion = "1.6.1"
28+
extJUnitVersion = "1.2.1"
29+
runnerVersion = "1.6.1"
30+
rulesVersion = "1.6.1"
3131
}

‎integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎runner/AndroidJunitRunnerSample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apply plugin: "com.android.application"
22

33

44
android {
5-
compileSdk 33
5+
compileSdk 34
66
defaultConfig {
77
applicationId "com.example.android.testing.androidjunitrunnersample"
8-
minSdkVersion 14
9-
targetSdkVersion 33
8+
minSdkVersion 21
9+
targetSdkVersion 34
1010
versionCode 1
1111
versionName "1.0"
1212

‎runner/AndroidJunitRunnerSample/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -27,10 +27,10 @@ ext {
2727
buildToolsVersion = "32.0.0"
2828
androidxAnnotationVersion = "1.5.0"
2929
guavaVersion = "31.1-android"
30-
coreVersion = "1.6.0-alpha01"
31-
extJUnitVersion = "1.2.0-alpha01"
32-
runnerVersion = "1.6.0-alpha03"
33-
rulesVersion = "1.6.0-alpha01"
34-
espressoVersion = "3.6.0-alpha01"
30+
coreVersion = "1.6.1"
31+
extJUnitVersion = "1.2.1"
32+
runnerVersion = "1.6.1"
33+
rulesVersion = "1.6.1"
34+
espressoVersion = "3.6.1"
3535
truthVersion = "1.1.3"
3636
}

‎runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎runner/AndroidTestOrchestratorSample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: "com.android.application"
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
defaultConfig {
66
applicationId "com.example.android.testing.androidtestorchestratorsample"
7-
minSdkVersion 14
8-
targetSdkVersion 33
7+
minSdkVersion 21
8+
targetSdkVersion 34
99
versionCode 1
1010
versionName "1.0"
1111

‎runner/AndroidTestOrchestratorSample/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -26,12 +26,12 @@ allprojects {
2626
ext {
2727
androidxAnnotationVersion = "1.5.0"
2828
guavaVersion = "31.1-android"
29-
coreVersion = "1.6.0-alpha01"
30-
extJUnitVersion = "1.2.0-alpha01"
31-
runnerVersion = "1.6.0-alpha03"
32-
monitorVersion = "1.7.0-alpha01"
33-
rulesVersion = "1.6.0-alpha01"
34-
espressoVersion = "3.6.0-alpha01"
35-
orchestratorVersion = "1.5.0-alpha01"
29+
coreVersion = "1.6.1"
30+
extJUnitVersion = "1.2.1"
31+
runnerVersion = "1.6.1"
32+
monitorVersion = "1.7.1"
33+
rulesVersion = "1.6.1"
34+
espressoVersion = "3.6.1"
35+
orchestratorVersion = "1.5.0"
3636
truthVersion = "1.1.3"
3737
}

‎runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎runner/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Jun 01 11:09:45 PDT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
distributionPath=wrapper/dists
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎test_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ for p in $(cat projects.conf); do
99
echo "====================================================================="
1010

1111
pushd $p > /dev/null # Silent pushd
12-
./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info | sed "s@^@$p @" # Prefix every line with directory
12+
./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info --no-watch-fs | sed "s@^@$p @" # Prefix every line with directory
1313
code=${PIPESTATUS[0]}
1414
if [ "$code" -ne "0" ]; then
1515
exit $code

‎ui/espresso/AccessibilitySample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: "com.android.application"
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
defaultConfig {
66
applicationId "com.example.android.testing.espresso.AccessibilitySample"
7-
minSdkVersion 14
8-
targetSdkVersion 33
7+
minSdkVersion 21
8+
targetSdkVersion 34
99
versionCode 1
1010
versionName "1.0"
1111

‎ui/espresso/AccessibilitySample/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlinVersion = "1.7.10"
5-
ext.agpVersion = "8.1.1"
4+
ext.kotlinVersion = "1.9.22"
5+
ext.agpVersion = "8.5.0"
66
repositories {
77
// Insert local test repo here
88
google()
@@ -27,11 +27,11 @@ allprojects {
2727

2828
ext {
2929
androidxAnnotationVersion = "1.5.0"
30-
robolectricVersion = "4.10.3"
31-
extTruthVersion = "1.6.0-alpha01"
32-
coreVersion = "1.6.0-alpha01"
33-
extJUnitVersion = "1.2.0-alpha01"
34-
runnerVersion = "1.6.0-alpha03"
35-
espressoVersion = "3.6.0-alpha01"
30+
robolectricVersion = "4.13"
31+
extTruthVersion = "1.6.0"
32+
coreVersion = "1.6.1"
33+
extJUnitVersion = "1.2.1"
34+
runnerVersion = "1.6.1"
35+
espressoVersion = "3.6.1"
3636
guavaVersion = "31.1-android"
3737
}

‎ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎ui/espresso/BasicSample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: "com.android.application"
33
apply plugin: "kotlin-android"
44

55
android {
6-
compileSdk 33
6+
compileSdk 34
77
defaultConfig {
88
applicationId "com.example.android.testing.espresso.BasicSample"
9-
minSdkVersion 14
10-
targetSdkVersion 33
9+
minSdkVersion 21
10+
targetSdkVersion 34
1111
versionCode 1
1212
versionName "1.0"
1313

‎ui/espresso/BasicSample/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlinVersion = "1.8.20"
5-
ext.agpVersion = "8.1.1"
4+
ext.kotlinVersion = "1.9.22"
5+
ext.agpVersion = "8.5.0"
66
repositories {
77
// Insert local test repo here
88
google()
@@ -27,11 +27,11 @@ allprojects {
2727

2828
ext {
2929
androidxAnnotationVersion = "1.5.0"
30-
robolectricVersion = "4.10.3"
30+
robolectricVersion = "4.13"
3131
guavaVersion = "31.1-android"
32-
extTruthVersion = "1.6.0-alpha01"
33-
coreVersion = "1.6.0-alpha01"
34-
extJUnitVersion = "1.2.0-alpha01"
35-
runnerVersion = "1.6.0-alpha03"
36-
espressoVersion = "3.6.0-alpha01"
32+
extTruthVersion = "1.6.0"
33+
coreVersion = "1.6.1"
34+
extJUnitVersion = "1.2.1"
35+
runnerVersion = "1.6.1"
36+
espressoVersion = "3.6.1"
3737
}

‎ui/espresso/BasicSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎ui/espresso/CustomMatcherSample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: "com.android.application"
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
defaultConfig {
66
applicationId "com.example.android.testing.espresso.CustomMatcherSample"
7-
minSdkVersion 14
8-
targetSdkVersion 33
7+
minSdkVersion 21
8+
targetSdkVersion 34
99
versionCode 1
1010
versionName "1.0"
1111

‎ui/espresso/CustomMatcherSample/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -26,10 +26,10 @@ allprojects {
2626
ext {
2727
androidxAnnotationVersion = "1.5.0"
2828
guavaVersion = "31.1-android"
29-
coreVersion = "1.6.0-alpha01"
30-
extJUnitVersion = "1.2.0-alpha01"
31-
runnerVersion = "1.6.0-alpha03"
32-
rulesVersion = "1.6.0-alpha01"
33-
espressoVersion = "3.6.0-alpha01"
34-
robolectricVersion = "4.10.3"
29+
coreVersion = "1.6.1"
30+
extJUnitVersion = "1.2.1"
31+
runnerVersion = "1.6.1"
32+
rulesVersion = "1.6.1"
33+
espressoVersion = "3.6.1"
34+
robolectricVersion = "4.13"
3535
}

‎ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎ui/espresso/DataAdapterSample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: "com.android.application"
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
defaultConfig {
66
applicationId "com.example.android.testing.espresso.DataAdapterSample"
7-
minSdkVersion 14
8-
targetSdkVersion 33
7+
minSdkVersion 21
8+
targetSdkVersion 34
99
versionCode 1
1010
versionName "1.0"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎ui/espresso/DataAdapterSample/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -26,9 +26,9 @@ allprojects {
2626
ext {
2727
androidxAnnotationVersion = "1.5.0"
2828
guavaVersion = "31.1-android"
29-
coreVersion = "1.6.0-alpha01"
30-
extJUnitVersion = "1.2.0-alpha01"
31-
runnerVersion = "1.6.0-alpha03"
32-
espressoVersion = "3.6.0-alpha01"
33-
robolectricVersion = "4.10.3"
29+
coreVersion = "1.6.1"
30+
extJUnitVersion = "1.2.1"
31+
runnerVersion = "1.6.1"
32+
espressoVersion = "3.6.1"
33+
robolectricVersion = "4.13"
3434
}

‎ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎ui/espresso/EspressoDeviceSample/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: "com.android.application"
33
apply plugin: "kotlin-android"
44

55
android {
6-
compileSdk 33
6+
compileSdk 34
77
defaultConfig {
88
applicationId "com.example.android.testing.espresso.EspressoDeviceSample"
9-
minSdkVersion 19
10-
targetSdkVersion 33
9+
minSdkVersion 21
10+
targetSdkVersion 34
1111
versionCode 1
1212
versionName "1.0"
1313

‎ui/espresso/EspressoDeviceSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlinVersion = "1.8.20"
5-
ext.agpVersion = '8.3.2'
4+
ext.kotlinVersion = "1.9.22"
5+
ext.agpVersion = "8.5.0"
66
repositories {
77
// Insert local test repo here
88
google()
@@ -26,8 +26,8 @@ allprojects {
2626
}
2727

2828
ext {
29-
robolectricVersion = "4.10.3"
30-
extTruthVersion = "1.6.0-alpha04"
31-
extJUnitVersion = "1.2.0-alpha04"
29+
robolectricVersion = "4.13"
30+
extTruthVersion = "1.6.0"
31+
extJUnitVersion = "1.2.1"
3232
espressoDeviceVersion = "1.0.0-alpha09"
3333
}

‎ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)