Skip to content

Commit 3f15a6f

Browse files
brettchabotcopybara-androidxtest
authored andcommitted
Use JDK 21 for test actions too.
PiperOrigin-RevId: 740050574
1 parent 4eedd77 commit 3f15a6f

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ jobs:
5555
steps:
5656
- name: Check out repository code
5757
uses: actions/checkout@v4
58-
- name: Install Java 17
58+
- name: Install Java 21
5959
uses: actions/setup-java@v4
6060
with:
6161
distribution: 'zulu'
62-
java-version: '17'
62+
java-version: '21'
6363
- name: 'Cache Bazel files'
6464
uses: actions/cache@v4
6565
with:
@@ -81,11 +81,11 @@ jobs:
8181
steps:
8282
- name: Check out repository code
8383
uses: actions/checkout@v4
84-
- name: Install Java 17
84+
- name: Install Java 21
8585
uses: actions/setup-java@v4
8686
with:
8787
distribution: 'zulu'
88-
java-version: '17'
88+
java-version: '21'
8989
- name: Gradle wrapper validation
9090
uses: gradle/wrapper-validation-action@v2
9191
- name: Enable KVM group perms

build_extensions/axt_android_local_test.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@build_bazel_rules_android//android:rules.bzl", "android_library", "androi
44
load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library")
55
load("//build_extensions:create_jar.bzl", "create_jar")
66

7-
def axt_android_local_test(name, srcs = [], deps = [], manifest = "//build_extensions:AndroidManifest_robolectric.xml", tags = ["robolectric"], **kwargs):
7+
def axt_android_local_test(name, srcs = [], deps = [], manifest = "//build_extensions:AndroidManifest_robolectric.xml", tags = ["robolectric"], jvm_flags = [], **kwargs):
88
"""A wrapper around android_local_test that provides sensible defaults for androidx.test.
99
1010
@@ -52,6 +52,8 @@ def axt_android_local_test(name, srcs = [], deps = [], manifest = "//build_exten
5252
srcs = srcs,
5353
tags = tags,
5454
manifest = manifest,
55+
# Allow running tests on JDK 21. See https://github.com/bazelbuild/bazel/issues/14502
56+
jvm_flags = jvm_flags + ["-Djava.security.manager=allow"],
5557
deps = deps,
5658
**kwargs
5759
)

kokoro/test_artifacts.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ unzip "${KOKORO_GFILE_DIR}/axt_m2repository.zip" -d "/root/.m2"
1111
curl -s https://repos.azul.com/azul-repo.key | sudo gpg --dearmor -o /usr/share/keyrings/azul.gpg
1212
echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | sudo tee /etc/apt/sources.list.d/zulu.list
1313
apt-get update
14-
apt-get install -y zulu17-jdk
15-
export JAVA_HOME="$(update-java-alternatives -l | grep "1.17" | head -n 1 | tr -s " " | cut -d " " -f 3)"
14+
apt-get install -y zulu21-jdk
15+
export JAVA_HOME="$(update-java-alternatives -l | grep "1.21" | head -n 1 | tr -s " " | cut -d " " -f 3)"
1616

1717
cd gradle-tests
1818
./gradlew nexusOneDebugAndroidTest --stacktrace -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Dandroid.experimental.androidTest.numManagedDeviceShards=1

0 commit comments

Comments
 (0)