Skip to content

Commit 0e0f35f

Browse files
Paige McAuliffecopybara-androidxtest
Paige McAuliffe
authored and
copybara-androidxtest
committed
Add internet permission for espresso device gradle tests
FUTURE_COPYBARA_INTEGRATE_REVIEW=#2375 from android:incrementVersions 023aed7 PiperOrigin-RevId: 740117294
1 parent 7554b07 commit 0e0f35f

File tree

5 files changed

+34
-33
lines changed

5 files changed

+34
-33
lines changed

‎build_extensions/axt_released_versions.bzl

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"""Defines current released AXT versions."""
22

3-
RUNNER_VERSION = "1.7.0-alpha01"
4-
RULES_VERSION = "1.7.0-alpha01"
5-
MONITOR_VERSION = "1.8.0-alpha01"
6-
ESPRESSO_VERSION = "3.7.0-alpha01"
7-
CORE_VERSION = "1.7.0-alpha01"
8-
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha01"
9-
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha01"
10-
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha01"
11-
ORCHESTRATOR_VERSION = "1.6.0-alpha02"
12-
SERVICES_VERSION = "1.6.0-alpha02"
3+
RUNNER_VERSION = "1.7.0-alpha02"
4+
RULES_VERSION = "1.7.0-alpha02"
5+
MONITOR_VERSION = "1.8.0-alpha02"
6+
ESPRESSO_VERSION = "3.7.0-alpha02"
7+
CORE_VERSION = "1.7.0-alpha02"
8+
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha02"
9+
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha02"
10+
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha02"
11+
ORCHESTRATOR_VERSION = "1.6.0-alpha03"
12+
SERVICES_VERSION = "1.6.0-alpha03"

‎build_extensions/axt_versions.bzl

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ Use tools/release/validate_and_propagate_versions.sh to propagate these versions
44
//:axt_m2_repository and gradle-tests/settings.gradle
55
"""
66

7-
RUNNER_VERSION = "1.7.0-alpha02"
8-
RULES_VERSION = "1.7.0-alpha02"
9-
MONITOR_VERSION = "1.8.0-alpha02"
10-
ESPRESSO_VERSION = "3.7.0-alpha02"
11-
CORE_VERSION = "1.7.0-alpha02"
12-
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha02"
13-
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha02"
14-
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha02"
15-
ORCHESTRATOR_VERSION = "1.6.0-alpha03"
16-
SERVICES_VERSION = "1.6.0-alpha03"
7+
RUNNER_VERSION = "1.7.0-alpha03"
8+
RULES_VERSION = "1.7.0-alpha03"
9+
MONITOR_VERSION = "1.8.0-alpha03"
10+
ESPRESSO_VERSION = "3.7.0-alpha03"
11+
CORE_VERSION = "1.7.0-alpha03"
12+
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha03"
13+
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha03"
14+
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha03"
15+
ORCHESTRATOR_VERSION = "1.6.0-alpha04"
16+
SERVICES_VERSION = "1.6.0-alpha04"
1717

1818
# Full maven artifact strings for apks.
1919
SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION

‎gradle-tests/espresso/device/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
4+
<uses-permission android:name="android.permission.INTERNET"/>
45

56
<application>
67
<activity

‎gradle-tests/settings.gradle

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ dependencyResolutionManagement {
1818
}
1919
versionCatalogs {
2020
libs {
21-
library('core', 'androidx.test:core:1.7.0-alpha02')
22-
library('runner', 'androidx.test:runner:1.7.0-alpha02')
23-
library('ext.junit', 'androidx.test.ext:junit:1.3.0-alpha02')
24-
library('ext.truth', 'androidx.test.ext:truth:1.7.0-alpha02')
25-
library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.7.0-alpha02')
26-
library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.7.0-alpha02')
27-
library('espresso.core', 'androidx.test.espresso:espresso-core:3.7.0-alpha02')
28-
library('espresso.device', 'androidx.test.espresso:espresso-device:1.1.0-alpha02')
29-
library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.7.0-alpha02')
30-
library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.7.0-alpha02')
31-
library('espresso.web', 'androidx.test.espresso:espresso-web:3.7.0-alpha02')
32-
library('orchestrator', 'androidx.test:orchestrator:1.6.0-alpha03')
21+
library('core', 'androidx.test:core:1.7.0-alpha03')
22+
library('runner', 'androidx.test:runner:1.7.0-alpha03')
23+
library('ext.junit', 'androidx.test.ext:junit:1.3.0-alpha03')
24+
library('ext.truth', 'androidx.test.ext:truth:1.7.0-alpha03')
25+
library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.7.0-alpha03')
26+
library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.7.0-alpha03')
27+
library('espresso.core', 'androidx.test.espresso:espresso-core:3.7.0-alpha03')
28+
library('espresso.device', 'androidx.test.espresso:espresso-device:1.1.0-alpha03')
29+
library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.7.0-alpha03')
30+
library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.7.0-alpha03')
31+
library('espresso.web', 'androidx.test.espresso:espresso-web:3.7.0-alpha03')
32+
library('orchestrator', 'androidx.test:orchestrator:1.6.0-alpha04')
3333

3434
}
3535
}

‎kokoro/test_artifacts.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ export JAVA_HOME="$(update-java-alternatives -l | grep "1.21" | head -n 1 | tr -
1616

1717
cd gradle-tests
1818
# TODO(b/406071564): remove exclusion of espresso-device tests once they work in kokoro env
19-
./gradlew nexusOneDebugAndroidTest --stacktrace -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Dandroid.experimental.androidTest.numManagedDeviceShards=1 -x :espresso:device:nexusOneDebugAndroidTest
19+
./gradlew nexusOneDebugAndroidTest --stacktrace -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Dandroid.experimental.androidTest.numManagedDeviceShards=1

0 commit comments

Comments
 (0)