[6.6.0] Fixes for using recent Xcodes and macOS 26

.bazelci/presubmit.yml

@@ -1,11 +1,9 @@
 ---
 tasks:
+  # This task actually runs Rocky Linux 8 (OpenJDK 11, gcc 10.2.1)
   centos7_java11_devtoolset10:
     shards: 4
     shell_commands:
-      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
-        android_ndk_repository/android_ndk_repository/' WORKSPACE
-      - rm -f WORKSPACE.bak
       - rm -rf $HOME/bazeltest
       - mkdir $HOME/bazeltest
     build_flags:
@@ -20,6 +18,7 @@ tasks:
       - "//src:test_repos"
       - "//src/main/java/..."
     test_flags:
+      - "--test_output=errors"
       - "--sandbox_default_allow_network=false"
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
@@ -44,12 +43,14 @@ tasks:
       - "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
       - "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
       - "-//src/test/shell/bazel:bazel_coverage_sh_test"
+      # The CI infrastructure no longer supports these tests.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/..."
+      # https://github.com/bazelbuild/bazel/issues/16526#issuecomment-1415858550
+      - "-//src/test/shell/bazel:python_version_test"
   ubuntu1804:
     shards: 4
     shell_commands:
-      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
-        android_ndk_repository/android_ndk_repository/' WORKSPACE
-      - rm -f WORKSPACE.bak
       - rm -rf $HOME/bazeltest
       - mkdir $HOME/bazeltest
     build_flags:
@@ -62,6 +63,7 @@ tasks:
       - "//src:test_repos"
       - "//src/main/java/..."
     test_flags:
+      - "--test_output=errors"
       - "--sandbox_default_allow_network=false"
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
@@ -82,16 +84,16 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # The CI infrastructure no longer supports these tests.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/..."
   ubuntu1804_clang:
     platform: ubuntu1804
     environment:
       CC: clang
       CC_CONFIGURE_DEBUG: 1
     name: "Clang"
     shell_commands:
-      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
-        android_ndk_repository/android_ndk_repository/' WORKSPACE
-      - rm -f WORKSPACE.bak
       - rm -rf $HOME/bazeltest
       - mkdir $HOME/bazeltest
     build_flags:
@@ -103,18 +105,16 @@ tasks:
       - "//src:test_repos"
       - "//src/main/java/..."
     test_flags:
+      - "--test_output=errors"
       - "--sandbox_default_allow_network=false"
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     test_targets:
       - "//src/test/shell/bazel:cc_integration_test"
-  ubuntu2004:
+  ubuntu2004_java11:
     shards: 4
     shell_commands:
-      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
-        android_ndk_repository/android_ndk_repository/' WORKSPACE
-      - rm -f WORKSPACE.bak
       - rm -rf $HOME/bazeltest
       - mkdir $HOME/bazeltest
     build_flags:
@@ -127,6 +127,7 @@ tasks:
       - "//src:test_repos"
       - "//src/main/java/..."
     test_flags:
+      - "--test_output=errors"
       - "--sandbox_default_allow_network=false"
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
@@ -147,13 +148,13 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # The CI infrastructure no longer supports these tests.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/..."
   macos:
-    xcode_version: "14.2"
+    xcode_version: "16.2.0"
     shards: 5
     shell_commands:
-      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
-        android_ndk_repository/android_ndk_repository/' WORKSPACE
-      - rm -f WORKSPACE.bak
       - rm -rf $HOME/bazeltest
       - mkdir $HOME/bazeltest
       - ln -sf $OUTPUT_BASE/external $HOME/bazeltest/external
@@ -167,7 +168,8 @@ tasks:
       - "//src:test_repos"
       - "//src/main/java/..."
     test_flags:
-      - "--sandbox_default_allow_network=false"
+      - "--test_output=errors"
+      - "--sandbox_default_allow_network=true"
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
       - "--test_env=TEST_REPOSITORY_HOME=$HOME/bazeltest/external"
@@ -216,11 +218,13 @@ tasks:
       # https://github.com/bazelbuild/bazel/issues/17457
       - "-//src/test/shell/bazel:jdeps_test"
       - "-//scripts/docs:rewriter_test"
+      # The CI infrastructure no longer supports these tests.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/..."
 
   windows:
     shards: 4
     batch_commands:
-      - powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE"
       - mkdir C:\b
       - mklink /J C:\b\bazeltest_external %OUTPUT_BASE:/=\%\external
     build_flags:
@@ -235,6 +239,7 @@ tasks:
       - "//src:test_repos"
       - "//src/main/java/..."
     test_flags:
+      - "--test_output=errors"
       - "--copt=-w"
       - "--host_copt=-w"
       - "--test_tag_filters=-no_windows,-slow"
@@ -283,14 +288,15 @@ tasks:
       - "-//src/test/java/com/google/devtools/build/lib/remote:remote"
       - "-//src/test/shell/bazel/remote/..."
       - "-//tools/python:pywrapper_test"
+      # https://github.com/bazelbuild/bazel/issues/16526#issuecomment-1415858550
+      - "-//src/test/shell/bazel:python_version_test"
+      # The CI infrastructure no longer supports these tests.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/..."
+
   rbe_ubuntu1804:
     platform: ubuntu1804
     name: "RBE"
-    shell_commands:
-      - sed -i.bak
-        -e 's/^# android_sdk_repository/android_sdk_repository/'
-        -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE
-      - rm -f WORKSPACE.bak
     build_flags:
       - "--config=ubuntu1804_java11"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
@@ -303,6 +309,7 @@ tasks:
       - "//src:bazel_jdk_minimal"
       - "//src/main/java/..."
     test_flags:
+      - "--test_output=errors"
       - "--config=ubuntu1804_java11"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
@@ -338,11 +345,11 @@ tasks:
       - "-//src/test/py/bazel:bazel_yanked_versions_test"
       - "-//src/test/py/bazel:bzlmod_query_test"
       - "-//src/test/shell/bazel:verify_workspace"
+      # The CI infrastructure no longer supports these tests.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/..."
+
   kythe_ubuntu2004:
-    shell_commands:
-    - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
-      -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE
-    - rm -f WORKSPACE.bak
     index_flags:
     - "--define=kythe_corpus=github.com/bazelbuild/bazel"
     index_targets_query: "kind(\"cc_(binary|library|test|proto_library) rule\", ...) union kind(\"java_(binary|import|library|plugin|test|proto_library) rule\", ...) union kind(\"proto_library rule\", ...)"

.bazelrc

@@ -43,7 +43,9 @@ build:windows --host_cxxopt=/std:c++17
 
 # Enable Java 11 language features (https://github.com/bazelbuild/bazel/issues/14592)
 build --java_language_version=11
+build --java_runtime_version=remotejdk_11
 build --tool_java_language_version=11
+build --tool_java_runtime_version=remotejdk_11
 
 # Manually enable cc toolchain resolution before it is flipped. https://github.com/bazelbuild/bazel/issues/7260
 build --incompatible_enable_cc_toolchain_resolution

.bazelversion

@@ -1 +1 @@
-6.2.1
+6.3.2

WORKSPACE

@@ -433,64 +433,55 @@ dist_http_archive(
 
 dist_http_archive(
     name = "remotejdk11_linux_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 dist_http_archive(
     name = "remotejdk11_linux_aarch64_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 dist_http_archive(
     name = "remotejdk11_linux_ppc64le_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 dist_http_archive(
     name = "remotejdk11_linux_s390x_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 dist_http_archive(
     name = "remotejdk11_macos_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 dist_http_archive(
     name = "remotejdk11_macos_aarch64_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 dist_http_archive(
     name = "remotejdk11_win_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 dist_http_archive(
     name = "remotejdk11_win_arm64_for_testing",
-    build_file = "@local_jdk//:BUILD.bazel",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
 )
 
 [
     dist_http_archive(
         name = "remotejdk%s_%s_for_testing" % (version, os),
-        build_file = "@local_jdk//:BUILD.bazel",
         patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
         patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
     )

distdir.bzl

@@ -15,6 +15,7 @@
 
 load("//:distdir_deps.bzl", "DEPS_BY_NAME")
 load("//tools/build_defs/repo:http.bzl", "http_archive", "http_file", "http_jar")
+load("//tools/jdk:jdk_build_file.bzl", "JDK_BUILD_TEMPLATE")
 
 _BUILD = """
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
@@ -91,6 +92,15 @@ def dist_http_archive(name, **kwargs):
         kwargs["patches"] = info.get("patches")
     if "strip_prefix" not in kwargs:
         kwargs["strip_prefix"] = info.get("strip_prefix")
+
+    name_without_remotejdk_prefix = name.removeprefix("remotejdk")
+    if name_without_remotejdk_prefix != name:
+        kwargs["build_file_content"] = JDK_BUILD_TEMPLATE.replace(
+            "___RUNTIME_VERSION___",
+            name_without_remotejdk_prefix.split("_", 1)[0],
+        )
+        kwargs.pop("build_file", default=None)
+
     http_archive(
         name = name,
         sha256 = info["sha256"],

distdir_deps.bzl

@@ -203,6 +203,10 @@ DIST_DEPS = {
         "license_kinds": [
             "@rules_license//licenses/generic:notice",
         ],
+        "patch_args": ["-p1"],
+        "patches": [
+            "//third_party/upb:01_remove_werror.patch",
+        ],
     },
     "c-ares": {
         "archive": "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz",

examples/py_native/test.py

@@ -8,10 +8,10 @@
 class TestGetNumber(unittest.TestCase):
 
   def test_ok(self):
-    self.assertEquals(GetNumber(), 42)
+    self.assertEqual(GetNumber(), 42)
 
   def test_fib(self):
-    self.assertEquals(Fib(5), 8)
+    self.assertEqual(Fib(5), 8)
 
 if __name__ == '__main__':
   unittest.main()

scripts/BUILD

@@ -28,6 +28,7 @@ genrule(
 sh_test(
     name = "bash_completion_test",
     size = "small",
+    timeout = "moderate",
     srcs = ["bash_completion_test.sh"],
     data = [
         "bazel-complete.bash",

scripts/bootstrap/compile.sh

@@ -447,6 +447,7 @@ function run_bazel_jar() {
       -XX:+HeapDumpOnOutOfMemoryError -Xverify:none -Dfile.encoding=ISO-8859-1 \
       -XX:HeapDumpPath=${OUTPUT_DIR} \
       -Djava.util.logging.config.file=${OUTPUT_DIR}/javalog.properties \
+      --add-opens java.base/java.lang=ALL-UNNAMED \
       ${JNI_FLAGS} \
       -jar ${ARCHIVE_DIR}/libblaze.jar \
       --batch \

src/BUILD

@@ -2,8 +2,14 @@
 
 load("//tools/python:private/defs.bzl", "py_binary", "py_library")
 load(":embedded_tools.bzl", "srcsfile")
+load(
+    ":release_archive.bzl",
+    "MINIMUM_JAVA_RUNTIME_VERSION",
+    "MINIMUM_JAVA_COMPILATION_RUNTIME_VERSION",
+    "release_archive",
+    "transitioned_java_version_filegroup",
+)
 load(":rule_size_test.bzl", "rule_size_test")
-load("//src:release_archive.bzl", "release_archive")
 
 package(default_applicable_licenses = ["@io_bazel//:license"])
 
@@ -540,18 +546,34 @@ genrule(
 )
 
 # Following targets build java_tools.zip - platform independent part of java_tools
-JAVA_TOOLS_DEPLOY_JARS = [
-    "//src/java_tools/buildjar:JavaBuilder_deploy.jar",
-    "//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar",
-    "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
-    "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_direct_binary_deploy.jar",
-    "//src/java_tools/junitrunner/java/com/google/testing/coverage:JacocoCoverage_jarjar_deploy.jar",
-    "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
-]
+transitioned_java_version_filegroup(
+    name = "minimum_java_runtime_tools",
+    java_language_version = MINIMUM_JAVA_RUNTIME_VERSION,
+    srcs = [
+        "//src/java_tools/junitrunner/java/com/google/testing/coverage:JacocoCoverage_jarjar_deploy.jar",
+        "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
+    ],
+    visibility = ["//visibility:private"],
+)
+
+transitioned_java_version_filegroup(
+    name = "minimum_java_compilation_runtime_tools",
+    java_language_version = MINIMUM_JAVA_COMPILATION_RUNTIME_VERSION,
+    srcs = [
+        "//src/java_tools/buildjar:JavaBuilder_deploy.jar",
+        "//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_direct_binary_deploy.jar",
+    ],
+    visibility = ["//visibility:private"],
+)
 
 release_archive(
     name = "jars_java_tools_zip",
-    srcs = JAVA_TOOLS_DEPLOY_JARS,
+    srcs = [
+        ":minimum_java_compilation_runtime_tools",
+        ":minimum_java_runtime_tools",
+    ],
     package_dir = "java_tools",
     visibility = ["//visibility:private"],
 )