commit ba29ac54f425083a967fb0e8ee0eb641b0ae27e7
author Sorin Basca <sorinbasca@google.com> Thu Jul 18 12:05:19 2024 +0100
committer Sorin Basca <sorinbasca@google.com> Thu Jul 18 12:05:19 2024 +0100
tree d17fb4f8f73246de04e97128f40684194def9af1
parent 60f44e93a832b4b91832d7260305d9d3c95d9719

Use JDK 21 instead of 17

Bug: 342332820
Test: TH
Change-Id: Id040a389243220eb4c5b47631bfdd9f27bc00923

core/ravenwood_test_config_template.xml

diff --git a/core/ravenwood_test_config_template.xml b/core/ravenwood_test_config_template.xml
index 16a22c0..088a55a 100644
--- a/core/ravenwood_test_config_template.xml
+++ b/core/ravenwood_test_config_template.xml
@@ -18,7 +18,7 @@
     <option name="test-suite-tag" value="ravenwood" />
     <option name="test-suite-tag" value="ravenwood-tests" />
 
-    <option name="java-folder" value="prebuilts/jdk/jdk17/linux-x86/" />
+    <option name="java-folder" value="prebuilts/jdk/jdk21/linux-x86/" />
     <option name="use-ravenwood-resources" value="true" />
     <option name="exclude-paths" value="java" />
     <option name="socket-timeout" value="10000" />

core/robolectric_test_config_template.xml

diff --git a/core/robolectric_test_config_template.xml b/core/robolectric_test_config_template.xml
index 56d2312..b1d0c2f 100644
--- a/core/robolectric_test_config_template.xml
+++ b/core/robolectric_test_config_template.xml
@@ -18,7 +18,7 @@
     <option name="test-suite-tag" value="robolectric" />
     <option name="test-suite-tag" value="robolectric-tests" />
 
-    <option name="java-folder" value="prebuilts/jdk/jdk17/linux-x86/" />
+    <option name="java-folder" value="prebuilts/jdk/jdk21/linux-x86/" />
     <option name="exclude-paths" value="java" />
     <option name="use-robolectric-resources" value="true" />