Skip to content

Commit 705b28d

Browse files
DevDengChaoDevDengChao
authored
Merge branch 'main' into refactor/truth
2 parents e243ae1 + 9ee5a21 commit 705b28d

File tree

61 files changed

+395
-161
lines changed

Some content is hidden

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

61 files changed

+395
-161
lines changed

‎integration/ServiceTestRuleSample/app/build.gradle‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ android {
1717
}
1818
productFlavors {
1919
}
20+
testOptions {
21+
managedDevices {
22+
devices {
23+
// run with ../gradlew nexusOneApi30DebugAndroidTest
24+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
25+
// A lower resolution device is used here for better emulator performance
26+
device = "Nexus One"
27+
apiLevel = 30
28+
// Also use the AOSP ATD image for better emulator performance
29+
systemImageSource = "aosp-atd"
30+
}
31+
}
32+
}
33+
}
2034
}
2135

2236
dependencies {

‎integration/ServiceTestRuleSample/build.gradle‎

Lines changed: 5 additions & 5 deletions
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 = "7.0.2"
4+
ext.agpVersion = "7.3.0-alpha07"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -25,8 +25,8 @@ allprojects {
2525

2626
ext {
2727
buildToolsVersion = "31.0.0"
28-
coreVersion = "1.4.1-alpha05"
29-
extJUnitVersion = "1.1.4-alpha05"
30-
runnerVersion = "1.5.0-alpha02"
31-
rulesVersion = "1.4.1-alpha05"
28+
coreVersion = "1.4.1-alpha06"
29+
extJUnitVersion = "1.1.4-alpha06"
30+
runnerVersion = "1.5.0-alpha03"
31+
rulesVersion = "1.4.1-alpha06"
3232
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

‎projects.conf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ ui/espresso/RecyclerViewSample
1515
ui/espresso/ScreenshotSample
1616
ui/espresso/WebBasicSample
1717
ui/uiautomator/BasicSample
18-
unit/BasicSample
19-
unit/BasicUnitAndroidTest

‎runner/AndroidJunitRunnerSample/app/build.gradle‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,20 @@ android {
2121
}
2222
productFlavors {
2323
}
24-
24+
testOptions {
25+
managedDevices {
26+
devices {
27+
// run with ../gradlew nexusOneApi30DebugAndroidTest
28+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
29+
// A lower resolution device is used here for better emulator performance
30+
device = "Nexus One"
31+
apiLevel = 30
32+
// Also use the AOSP ATD image for better emulator performance
33+
systemImageSource = "aosp-atd"
34+
}
35+
}
36+
}
37+
}
2538
useLibrary 'android.test.runner'
2639

2740
useLibrary 'android.test.base'

‎runner/AndroidJunitRunnerSample/build.gradle‎

Lines changed: 6 additions & 6 deletions
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 = "7.0.2"
4+
ext.agpVersion = "7.3.0-alpha07"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -27,10 +27,10 @@ ext {
2727
buildToolsVersion = "31.0.0"
2828
androidxAnnotationVersion = "1.2.0"
2929
guavaVersion = "30.1.1-android"
30-
coreVersion = "1.4.1-alpha05"
31-
extJUnitVersion = "1.1.4-alpha05"
32-
runnerVersion = "1.5.0-alpha02"
33-
rulesVersion = "1.4.1-alpha05"
34-
espressoVersion = "3.5.0-alpha05"
30+
coreVersion = "1.4.1-alpha06"
31+
extJUnitVersion = "1.1.4-alpha06"
32+
runnerVersion = "1.5.0-alpha03"
33+
rulesVersion = "1.4.1-alpha06"
34+
espressoVersion = "3.5.0-alpha06"
3535
truthVersion = "1.1.3"
3636
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

‎runner/AndroidTestOrchestratorSample/app/build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@ android {
2424

2525
testOptions {
2626
execution 'ANDROIDX_TEST_ORCHESTRATOR'
27+
managedDevices {
28+
devices {
29+
// run with ../gradlew nexusOneApi30DebugAndroidTest
30+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
31+
// A lower resolution device is used here for better emulator performance
32+
device = "Nexus One"
33+
apiLevel = 30
34+
// Also use the AOSP ATD image for better emulator performance
35+
systemImageSource = "aosp-atd"
36+
}
37+
}
38+
}
2739
}
2840
}
2941

‎runner/AndroidTestOrchestratorSample/build.gradle‎

Lines changed: 8 additions & 8 deletions
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 = "7.0.2"
4+
ext.agpVersion = "7.3.0-alpha07"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -27,12 +27,12 @@ ext {
2727
buildToolsVersion = "31.0.0"
2828
androidxAnnotationVersion = "1.2.0"
2929
guavaVersion = "30.1.1-android"
30-
coreVersion = "1.4.1-alpha05"
31-
extJUnitVersion = "1.1.4-alpha05"
32-
runnerVersion = "1.5.0-alpha02"
33-
monitorVersion = "1.6.0-alpha02"
34-
rulesVersion = "1.4.1-alpha05"
35-
espressoVersion = "3.5.0-alpha05"
36-
orchestratorVersion = "1.4.2-alpha02"
30+
coreVersion = "1.4.1-alpha06"
31+
extJUnitVersion = "1.1.4-alpha06"
32+
runnerVersion = "1.5.0-alpha03"
33+
monitorVersion = "1.6.0-alpha03"
34+
rulesVersion = "1.4.1-alpha06"
35+
espressoVersion = "3.5.0-alpha06"
36+
orchestratorVersion = "1.4.2-alpha03"
3737
truthVersion = "1.1.3"
3838
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

0 commit comments

Comments
 (0)