From 8199becf1d6b51c00996b58131e38ec42acb62f7 Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Wed, 13 Mar 2024 11:21:20 +0100
Subject: [PATCH] Fix presubmit build (#423)

- Update .bazelversion for java-maven
- Setting JAVA_HOME for android-robolectric-testing-macos (Addressing
similar issue as https://github.com/bazelbuild/rules_kotlin/issues/1129
after JDK 21 update)
---
 .bazelci/android.yml     | 2 ++
 java-maven/.bazelversion | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.bazelci/android.yml b/.bazelci/android.yml
index c446920bf..ef223eb5b 100644
--- a/.bazelci/android.yml
+++ b/.bazelci/android.yml
@@ -80,6 +80,8 @@ tasks:
     <<: *android-robolectric
   android-robolectric-testing-macos:
     platform: macos
+    environment:
+      JAVA_HOME: /Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home
     <<: *android-robolectric
   #  android-robolectric-testing-windows:
   #    platform: windows
diff --git a/java-maven/.bazelversion b/java-maven/.bazelversion
index 19b860c18..a3fcc7121 100644
--- a/java-maven/.bazelversion
+++ b/java-maven/.bazelversion
@@ -1 +1 @@
-6.4.0
+7.1.0