Skip to content

Commit 3aba990

Browse files
brettchabotbrettchabot
authored
Merge pull request #343 from android/131alpha01_2
Update to androidx.test 1.3.1-alpha01 and targetsdk 30.
2 parents 181cb63 + eb67279 commit 3aba990

35 files changed

Lines changed: 143 additions & 143 deletions

File tree

‎integration/ServiceTestRuleSample/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 30
55
buildToolsVersion rootProject.buildToolsVersion
66
defaultConfig {
77
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
88
minSdkVersion 14
9-
targetSdkVersion 29
9+
targetSdkVersion 30
1010
versionCode 1
1111
versionName "1.0"
1212

‎integration/ServiceTestRuleSample/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ allprojects {
2323
}
2424

2525
ext {
26-
buildToolsVersion = "30.0.1"
27-
coreVersion = "1.3.0"
28-
extJUnitVersion = "1.1.2"
29-
runnerVersion = "1.3.0"
30-
rulesVersion = "1.3.0"
26+
buildToolsVersion = "30.0.2"
27+
coreVersion = "1.3.1-alpha01"
28+
extJUnitVersion = "1.1.3-alpha01"
29+
runnerVersion = "1.3.1-alpha01"
30+
rulesVersion = "1.3.1-alpha01"
3131
}

‎runner/AndroidJunitRunnerSample/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
22

33

44
android {
5-
compileSdkVersion 29
5+
compileSdkVersion 30
66
buildToolsVersion rootProject.buildToolsVersion
77
defaultConfig {
88
applicationId "com.example.android.testing.androidjunitrunnersample"
99
minSdkVersion 14
10-
targetSdkVersion 29
10+
targetSdkVersion 30
1111
versionCode 1
1212
versionName "1.0"
1313

‎runner/AndroidJunitRunnerSample/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ allprojects {
2323
}
2424

2525
ext {
26-
buildToolsVersion = "30.0.1"
26+
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.0"
30-
extJUnitVersion = "1.1.2"
31-
runnerVersion = "1.3.0"
32-
rulesVersion = "1.3.0"
33-
espressoVersion = "3.3.0"
29+
coreVersion = "1.3.1-alpha01"
30+
extJUnitVersion = "1.1.3-alpha01"
31+
runnerVersion = "1.3.1-alpha01"
32+
rulesVersion = "1.3.1-alpha01"
33+
espressoVersion = "3.4.0-alpha01"
3434
}

‎runner/AndroidTestOrchestratorSample/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 30
55
buildToolsVersion rootProject.buildToolsVersion
66
defaultConfig {
77
applicationId "com.example.android.testing.androidtestorchestratorsample"
88
minSdkVersion 14
9-
targetSdkVersion 29
9+
targetSdkVersion 30
1010
versionCode 1
1111
versionName "1.0"
1212

‎runner/AndroidTestOrchestratorSample/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ allprojects {
2323
}
2424

2525
ext {
26-
buildToolsVersion = "30.0.1"
26+
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.0"
30-
extJUnitVersion = "1.1.2"
31-
runnerVersion = "1.3.0"
32-
rulesVersion = "1.3.0"
33-
espressoVersion = "3.3.0"
29+
coreVersion = "1.3.1-alpha01"
30+
extJUnitVersion = "1.1.3-alpha01"
31+
runnerVersion = "1.3.1-alpha01"
32+
rulesVersion = "1.3.1-alpha01"
33+
espressoVersion = "3.4.0-alpha01"
3434
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 29
8+
compileSdkVersion 30
99
buildToolsVersion rootProject.buildToolsVersion
1010
defaultConfig {
1111
applicationId "com.example.android.testing.espresso.BasicSample"
1212
minSdkVersion 14
13-
targetSdkVersion 29
13+
targetSdkVersion 30
1414
versionCode 1
1515
versionName "1.0"
1616

‎ui/espresso/BasicSample/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ allprojects {
2525
}
2626

2727
ext {
28-
buildToolsVersion = "30.0.1"
28+
buildToolsVersion = "30.0.2"
2929
androidxAnnotationVersion = "1.1.0"
30-
robolectricVersion = "4.4"
30+
robolectricVersion = "4.5-alpha-1"
3131
guavaVersion = "29.0-android"
3232
extTruthVersion = '1.3.0-rc01'
33-
coreVersion = "1.3.0"
34-
extJUnitVersion = "1.1.2"
35-
runnerVersion = "1.3.0"
36-
espressoVersion = "3.3.0"
33+
coreVersion = "1.3.1-alpha01"
34+
extJUnitVersion = "1.1.3-alpha01"
35+
runnerVersion = "1.3.1-alpha01"
36+
espressoVersion = "3.4.0-alpha01"
3737
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 30
55
buildToolsVersion rootProject.buildToolsVersion
66
defaultConfig {
77
applicationId "com.example.android.testing.espresso.CustomMatcherSample"
88
minSdkVersion 14
9-
targetSdkVersion 29
9+
targetSdkVersion 30
1010
versionCode 1
1111
versionName "1.0"
1212

‎ui/espresso/CustomMatcherSample/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ allprojects {
2323
}
2424

2525
ext {
26-
buildToolsVersion = "30.0.1"
26+
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.0"
30-
extJUnitVersion = "1.1.2"
31-
runnerVersion = "1.3.0"
32-
rulesVersion = "1.3.0"
33-
espressoVersion = "3.3.0"
34-
robolectricVersion = "4.4"
29+
coreVersion = "1.3.1-alpha01"
30+
extJUnitVersion = "1.1.3-alpha01"
31+
runnerVersion = "1.3.1-alpha01"
32+
rulesVersion = "1.3.1-alpha01"
33+
espressoVersion = "3.4.0-alpha01"
34+
robolectricVersion = "4.5-alpha-1"
3535
}

0 commit comments

Comments
 (0)