Skip to content

Commit c56ba22

Browse files
brettchabotbrettchabot
authored
Merge pull request #362 from android/axt131alpha03
Update to androidx.test 1.3.1-alpha03
2 parents 38155c7 + 133b8e0 commit c56ba22

File tree

19 files changed

+94
-86
lines changed

19 files changed

+94
-86
lines changed

‎integration/ServiceTestRuleSample/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ allprojects {
2424

2525
ext {
2626
buildToolsVersion = "30.0.2"
27-
coreVersion = "1.3.1-alpha02"
28-
extJUnitVersion = "1.1.3-alpha02"
29-
runnerVersion = "1.3.1-alpha02"
30-
rulesVersion = "1.3.1-alpha02"
27+
coreVersion = "1.3.1-alpha03"
28+
extJUnitVersion = "1.1.3-alpha03"
29+
runnerVersion = "1.3.1-alpha03"
30+
rulesVersion = "1.3.1-alpha03"
3131
}

‎runner/AndroidJunitRunnerSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.1-alpha02"
30-
extJUnitVersion = "1.1.3-alpha02"
31-
runnerVersion = "1.3.1-alpha02"
32-
rulesVersion = "1.3.1-alpha02"
33-
espressoVersion = "3.4.0-alpha02"
29+
coreVersion = "1.3.1-alpha03"
30+
extJUnitVersion = "1.1.3-alpha03"
31+
runnerVersion = "1.3.1-alpha03"
32+
rulesVersion = "1.3.1-alpha03"
33+
espressoVersion = "3.4.0-alpha03"
3434
}

‎runner/AndroidTestOrchestratorSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.1-alpha02"
30-
extJUnitVersion = "1.1.3-alpha02"
31-
runnerVersion = "1.3.1-alpha02"
32-
rulesVersion = "1.3.1-alpha02"
33-
espressoVersion = "3.4.0-alpha02"
29+
coreVersion = "1.3.1-alpha03"
30+
extJUnitVersion = "1.1.3-alpha03"
31+
runnerVersion = "1.3.1-alpha03"
32+
rulesVersion = "1.3.1-alpha03"
33+
espressoVersion = "3.4.0-alpha03"
3434
}

‎ui/espresso/AccessibilitySample/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ ext {
2929
androidxAnnotationVersion = "1.1.0"
3030
robolectricVersion = "4.5-alpha-1"
3131
extTruthVersion = '1.3.1-alpha02'
32-
coreVersion = "1.3.1-alpha02"
33-
extJUnitVersion = "1.1.3-alpha02"
34-
runnerVersion = "1.3.1-alpha02"
35-
espressoVersion = "3.4.0-alpha02"
32+
coreVersion = "1.3.1-alpha03"
33+
extJUnitVersion = "1.1.3-alpha03"
34+
runnerVersion = "1.3.1-alpha03"
35+
espressoVersion = "3.4.0-alpha03"
3636
guavaVersion = "29.0-android"
3737
}

‎ui/espresso/BasicSample/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ext {
3030
robolectricVersion = "4.5-alpha-1"
3131
guavaVersion = "29.0-android"
3232
extTruthVersion = '1.3.0-rc01'
33-
coreVersion = "1.3.1-alpha02"
34-
extJUnitVersion = "1.1.3-alpha02"
35-
runnerVersion = "1.3.1-alpha02"
36-
espressoVersion = "3.4.0-alpha02"
33+
coreVersion = "1.3.1-alpha03"
34+
extJUnitVersion = "1.1.3-alpha03"
35+
runnerVersion = "1.3.1-alpha03"
36+
espressoVersion = "3.4.0-alpha03"
3737
}

‎ui/espresso/CustomMatcherSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.1-alpha02"
30-
extJUnitVersion = "1.1.3-alpha02"
31-
runnerVersion = "1.3.1-alpha02"
32-
rulesVersion = "1.3.1-alpha02"
33-
espressoVersion = "3.4.0-alpha02"
29+
coreVersion = "1.3.1-alpha03"
30+
extJUnitVersion = "1.1.3-alpha03"
31+
runnerVersion = "1.3.1-alpha03"
32+
rulesVersion = "1.3.1-alpha03"
33+
espressoVersion = "3.4.0-alpha03"
3434
robolectricVersion = "4.5-alpha-1"
3535
}

‎ui/espresso/DataAdapterSample/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.1-alpha02"
30-
extJUnitVersion = "1.1.3-alpha02"
31-
runnerVersion = "1.3.1-alpha02"
32-
espressoVersion = "3.4.0-alpha02"
29+
coreVersion = "1.3.1-alpha03"
30+
extJUnitVersion = "1.1.3-alpha03"
31+
runnerVersion = "1.3.1-alpha03"
32+
espressoVersion = "3.4.0-alpha03"
3333
robolectricVersion = "4.5-alpha-1"
3434
}

‎ui/espresso/FragmentScenarioSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ ext {
3030
androidxCoreVersion = "1.2.0"
3131
androidxCompatVersion = "1.1.0-rc01"
3232
androidxFragmentVersion = "1.1.0-rc01"
33-
coreVersion = "1.3.1-alpha02"
34-
extJUnitVersion = "1.1.3-alpha02"
35-
runnerVersion = "1.3.1-alpha02"
36-
rulesVersion = "1.3.1-alpha02"
37-
espressoVersion = "3.4.0-alpha02"
33+
coreVersion = "1.3.1-alpha03"
34+
extJUnitVersion = "1.1.3-alpha03"
35+
runnerVersion = "1.3.1-alpha03"
36+
rulesVersion = "1.3.1-alpha03"
37+
espressoVersion = "3.4.0-alpha03"
3838
robolectricVersion = "4.5-alpha-1"
3939
truthVersion = "1.0.1"
4040
}

‎ui/espresso/IdlingResourceSample/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ ext {
4242
buildToolsVersion = "30.0.2"
4343
androidxAnnotationVersion = "1.1.0"
4444
guavaVersion = "29.0-android"
45-
coreVersion = "1.3.1-alpha02"
46-
extJUnitVersion = "1.1.3-alpha02"
47-
runnerVersion = "1.3.1-alpha02"
48-
espressoVersion = "3.4.0-alpha02"
45+
coreVersion = "1.3.1-alpha03"
46+
extJUnitVersion = "1.1.3-alpha03"
47+
runnerVersion = "1.3.1-alpha03"
48+
espressoVersion = "3.4.0-alpha03"
4949
}

‎ui/espresso/IntentsAdvancedSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ allprojects {
2525
ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
28-
coreVersion = "1.3.1-alpha02"
29-
extJUnitVersion = "1.1.3-alpha02"
30-
runnerVersion = "1.3.1-alpha02"
31-
rulesVersion = "1.3.1-alpha02"
32-
espressoVersion = "3.4.0-alpha02"
28+
coreVersion = "1.3.1-alpha03"
29+
extJUnitVersion = "1.1.3-alpha03"
30+
runnerVersion = "1.3.1-alpha03"
31+
rulesVersion = "1.3.1-alpha03"
32+
espressoVersion = "3.4.0-alpha03"
3333
}

‎ui/espresso/IntentsBasicSample/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
androidxCoreVersion = "1.2.0"
29-
coreVersion = "1.3.1-alpha02"
30-
extJUnitVersion = "1.1.3-alpha02"
31-
runnerVersion = "1.3.1-alpha02"
32-
rulesVersion = "1.3.1-alpha02"
33-
espressoVersion = "3.4.0-alpha02"
34-
extJUnitVersion = "1.1.3-alpha02"
35-
extTruthVersion = "1.3.1-alpha02"
29+
coreVersion = "1.3.1-alpha03"
30+
extJUnitVersion = "1.1.3-alpha03"
31+
runnerVersion = "1.3.1-alpha03"
32+
rulesVersion = "1.3.1-alpha03"
33+
espressoVersion = "3.4.0-alpha03"
34+
extJUnitVersion = "1.1.3-alpha03"
35+
extTruthVersion = "1.3.1-alpha03"
3636
robolectricVersion = "4.5-alpha-1"
3737
}

‎ui/espresso/MultiProcessSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ task clean(type: Delete) {
4545
ext {
4646
buildToolsVersion = "30.0.2"
4747
androidxAnnotationVersion = "1.1.0"
48-
coreVersion = "1.3.1-alpha02"
49-
extJUnitVersion = "1.1.3-alpha02"
50-
runnerVersion = "1.3.1-alpha02"
51-
rulesVersion = "1.3.1-alpha02"
52-
espressoVersion = "3.4.0-alpha02"
48+
coreVersion = "1.3.1-alpha03"
49+
extJUnitVersion = "1.1.3-alpha03"
50+
runnerVersion = "1.3.1-alpha03"
51+
rulesVersion = "1.3.1-alpha03"
52+
espressoVersion = "3.4.0-alpha03"
5353
}

‎ui/espresso/MultiWindowSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.1-alpha02"
30-
extJUnitVersion = "1.1.3-alpha02"
31-
runnerVersion = "1.3.1-alpha02"
32-
rulesVersion = "1.3.1-alpha02"
33-
espressoVersion = "3.4.0-alpha02"
29+
coreVersion = "1.3.1-alpha03"
30+
extJUnitVersion = "1.1.3-alpha03"
31+
runnerVersion = "1.3.1-alpha03"
32+
rulesVersion = "1.3.1-alpha03"
33+
espressoVersion = "3.4.0-alpha03"
3434
}
3535

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

+8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,14 @@ android {
2727
versionName "1.0"
2828

2929
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
30+
31+
multiDexEnabled true
32+
}
33+
compileOptions {
34+
sourceCompatibility 1.8
35+
targetCompatibility 1.8
3036
}
37+
3138
lintOptions {
3239
abortOnError false
3340
}
@@ -37,6 +44,7 @@ dependencies {
3744
// App dependencies
3845
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
3946
implementation 'androidx.recyclerview:recyclerview:' + rootProject.androidxRecyclerVersion;
47+
implementation 'androidx.multidex:multidex:2.0.1'
4048

4149
// Testing-only dependencies
4250
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;

‎ui/espresso/RecyclerViewSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ ext {
4343
androidxAnnotationVersion = "1.1.0"
4444
androidxRecyclerVersion = "1.1.0"
4545
guavaVersion = "29.0-android"
46-
coreVersion = "1.3.1-alpha02"
47-
extJUnitVersion = "1.1.3-alpha02"
48-
runnerVersion = "1.3.1-alpha02"
49-
rulesVersion = "1.3.1-alpha02"
50-
espressoVersion = "3.4.0-alpha02"
46+
coreVersion = "1.3.1-alpha03"
47+
extJUnitVersion = "1.1.3-alpha03"
48+
runnerVersion = "1.3.1-alpha03"
49+
rulesVersion = "1.3.1-alpha03"
50+
espressoVersion = "3.4.0-alpha03"
5151
}

‎ui/espresso/WebBasicSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
2828
guavaVersion = "29.0-android"
29-
coreVersion = "1.3.1-alpha02"
30-
extJUnitVersion = "1.1.3-alpha02"
31-
runnerVersion = "1.3.1-alpha02"
32-
rulesVersion = "1.3.1-alpha02"
33-
espressoVersion = "3.4.0-alpha02"
29+
coreVersion = "1.3.1-alpha03"
30+
extJUnitVersion = "1.1.3-alpha03"
31+
runnerVersion = "1.3.1-alpha03"
32+
rulesVersion = "1.3.1-alpha03"
33+
espressoVersion = "3.4.0-alpha03"
3434
}

‎ui/uiautomator/BasicSample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ ext {
2323
buildToolsVersion = "30.0.2"
2424
androidxAnnotationVersion = "1.1.0"
2525
guavaVersion = "29.0-android"
26-
coreVersion = "1.3.1-alpha02"
27-
extJUnitVersion = "1.1.3-alpha02"
28-
runnerVersion = "1.3.1-alpha02"
29-
rulesVersion = "1.3.1-alpha02"
30-
espressoVersion = "3.4.0-alpha02"
26+
coreVersion = "1.3.1-alpha03"
27+
extJUnitVersion = "1.1.3-alpha03"
28+
runnerVersion = "1.3.1-alpha03"
29+
rulesVersion = "1.3.1-alpha03"
30+
espressoVersion = "3.4.0-alpha03"
3131
uiAutomatorVersion = "2.2.0"
3232
}

‎unit/BasicUnitAndroidTest/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ allprojects {
2525
ext {
2626
buildToolsVersion = "30.0.2"
2727
androidxAnnotationVersion = "1.1.0"
28-
coreVersion = "1.3.1-alpha02"
29-
extJUnitVersion = "1.1.3-alpha02"
30-
runnerVersion = "1.3.1-alpha02"
28+
coreVersion = "1.3.1-alpha03"
29+
extJUnitVersion = "1.1.3-alpha03"
30+
runnerVersion = "1.3.1-alpha03"
3131
hamcrestVersion = "1.3"
3232
truthVersion = "1.0.1"
3333
}

‎update_versions.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ androidxCoreVersion="1.2.0"
1616
androidxRecyclerVersion="1.1.0"
1717
guavaVersion="29.0-android"
1818
truthVersion="1.0.1"
19-
runnerVersion="1.3.1-alpha02"
20-
rulesVersion="1.3.1-alpha02"
21-
coreVersion="1.3.1-alpha02"
22-
extJUnitVersion="1.1.3-alpha02"
23-
extTruthVersion="1.3.1-alpha02"
24-
espressoVersion="3.4.0-alpha02"
19+
runnerVersion="1.3.1-alpha03"
20+
rulesVersion="1.3.1-alpha03"
21+
coreVersion="1.3.1-alpha03"
22+
extJUnitVersion="1.1.3-alpha03"
23+
extTruthVersion="1.3.1-alpha03"
24+
espressoVersion="3.4.0-alpha03"
2525
robolectricVersion="4.5-alpha-1"
2626
uiAutomatorVersion="2.2.0"
2727

0 commit comments

Comments
 (0)