Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update versions of test dependencies + AGP. #517

Merged
merged 1 commit into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions integration/ServiceTestRuleSample/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down
10 changes: 5 additions & 5 deletions integration/ServiceTestRuleSample/build.gradle
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -24,8 +24,8 @@ allprojects {
}

ext {
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
rulesVersion = "1.6.0-alpha01"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
rulesVersion = "1.6.1"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions runner/AndroidJunitRunnerSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apply plugin: "com.android.application"


android {
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.example.android.testing.androidjunitrunnersample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down
12 changes: 6 additions & 6 deletions runner/AndroidJunitRunnerSample/build.gradle
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -27,10 +27,10 @@ ext {
buildToolsVersion = "32.0.0"
androidxAnnotationVersion = "1.5.0"
guavaVersion = "31.1-android"
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
rulesVersion = "1.6.0-alpha01"
espressoVersion = "3.6.0-alpha01"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
rulesVersion = "1.6.1"
espressoVersion = "3.6.1"
truthVersion = "1.1.3"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions runner/AndroidTestOrchestratorSample/app/build.gradle
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
16 changes: 8 additions & 8 deletions runner/AndroidTestOrchestratorSample/build.gradle
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -26,12 +26,12 @@ allprojects {
ext {
androidxAnnotationVersion = "1.5.0"
guavaVersion = "31.1-android"
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
monitorVersion = "1.7.0-alpha01"
rulesVersion = "1.6.0-alpha01"
espressoVersion = "3.6.0-alpha01"
orchestratorVersion = "1.5.0-alpha01"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
monitorVersion = "1.7.1"
rulesVersion = "1.6.1"
espressoVersion = "3.6.1"
orchestratorVersion = "1.5.0"
truthVersion = "1.1.3"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jun 01 11:09:45 PDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion test_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ for p in $(cat projects.conf); do
echo "====================================================================="

pushd $p > /dev/null # Silent pushd
./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info | sed "s@^@$p @" # Prefix every line with directory
./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info --no-watch-fs | sed "s@^@$p @" # Prefix every line with directory
code=${PIPESTATUS[0]}
if [ "$code" -ne "0" ]; then
exit $code
Expand Down
6 changes: 3 additions & 3 deletions ui/espresso/AccessibilitySample/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.example.android.testing.espresso.AccessibilitySample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down
16 changes: 8 additions & 8 deletions ui/espresso/AccessibilitySample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = "1.7.10"
ext.agpVersion = "8.1.1"
ext.kotlinVersion = "1.9.22"
ext.agpVersion = "8.5.0"
repositories {
// Insert local test repo here
google()
Expand All @@ -27,11 +27,11 @@ allprojects {

ext {
androidxAnnotationVersion = "1.5.0"
robolectricVersion = "4.10.3"
extTruthVersion = "1.6.0-alpha01"
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
espressoVersion = "3.6.0-alpha01"
robolectricVersion = "4.13"
extTruthVersion = "1.6.0"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
espressoVersion = "3.6.1"
guavaVersion = "31.1-android"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions ui/espresso/BasicSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ apply plugin: "com.android.application"
apply plugin: "kotlin-android"

android {
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.example.android.testing.espresso.BasicSample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down
16 changes: 8 additions & 8 deletions ui/espresso/BasicSample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = "1.8.20"
ext.agpVersion = "8.1.1"
ext.kotlinVersion = "1.9.22"
ext.agpVersion = "8.5.0"
repositories {
// Insert local test repo here
google()
Expand All @@ -27,11 +27,11 @@ allprojects {

ext {
androidxAnnotationVersion = "1.5.0"
robolectricVersion = "4.10.3"
robolectricVersion = "4.13"
guavaVersion = "31.1-android"
extTruthVersion = "1.6.0-alpha01"
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
espressoVersion = "3.6.0-alpha01"
extTruthVersion = "1.6.0"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
espressoVersion = "3.6.1"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions ui/espresso/CustomMatcherSample/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.example.android.testing.espresso.CustomMatcherSample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down
14 changes: 7 additions & 7 deletions ui/espresso/CustomMatcherSample/build.gradle
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -26,10 +26,10 @@ allprojects {
ext {
androidxAnnotationVersion = "1.5.0"
guavaVersion = "31.1-android"
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
rulesVersion = "1.6.0-alpha01"
espressoVersion = "3.6.0-alpha01"
robolectricVersion = "4.10.3"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
rulesVersion = "1.6.1"
espressoVersion = "3.6.1"
robolectricVersion = "4.13"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions ui/espresso/DataAdapterSample/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.example.android.testing.espresso.DataAdapterSample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
12 changes: 6 additions & 6 deletions ui/espresso/DataAdapterSample/build.gradle
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -26,9 +26,9 @@ allprojects {
ext {
androidxAnnotationVersion = "1.5.0"
guavaVersion = "31.1-android"
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
espressoVersion = "3.6.0-alpha01"
robolectricVersion = "4.10.3"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
espressoVersion = "3.6.1"
robolectricVersion = "4.13"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions ui/espresso/EspressoDeviceSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ apply plugin: "com.android.application"
apply plugin: "kotlin-android"

android {
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.example.android.testing.espresso.EspressoDeviceSample"
minSdkVersion 19
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down
10 changes: 5 additions & 5 deletions ui/espresso/EspressoDeviceSample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = "1.8.20"
ext.agpVersion = '8.3.2'
ext.kotlinVersion = "1.9.22"
ext.agpVersion = "8.5.0"
repositories {
// Insert local test repo here
google()
Expand All @@ -26,8 +26,8 @@ allprojects {
}

ext {
robolectricVersion = "4.10.3"
extTruthVersion = "1.6.0-alpha04"
extJUnitVersion = "1.2.0-alpha04"
robolectricVersion = "4.13"
extTruthVersion = "1.6.0"
extJUnitVersion = "1.2.1"
espressoDeviceVersion = "1.0.0-alpha09"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading