From 1752cb04f7809d939f00b85bd0f088780c04c695 Mon Sep 17 00:00:00 2001
From: Mathieu Olivari <molivari@apple.com>
Date: Tue, 26 May 2026 08:37:19 +0100
Subject: [PATCH] Upgrade Bazel to 9.1.0

Bumps the dev-time Bazel version (root and all integration test
workspaces) to 9.1.0, and adds 9.x to the BCR presubmit matrix. The
bazel_binaries integration test matrix now exercises 7.6.1, 8.7.0, and
9.1.0.

Updates direct module deps required for Bazel 9 (bazel_skylib 1.8.2,
platforms 1.0.0, rules_java 9.1.0, rules_shell 0.6.1, rules_python
1.7.0, gazelle 0.51.0).

To keep the Bazel 7 integration test matrix passing, the example
workspaces enable --experimental_rule_extension_api (required by
rules_java 9.x's java_single_jar.bzl under Bazel 7; default-on in
Bazel 8+). The pkl_package tests are migrated off the removed
@bazel_tools//tools/python/runfiles to @rules_python//python/runfiles.
---
 .bazelversion                                      |  2 +-
 MODULE.bazel                                       | 14 ++++++++------
 examples/pkl_project/.bazelversion                 |  2 +-
 scripts/prep-bcr-pr.sh                             |  4 ++--
 .../example_workspaces/mirror_rewrite/.bazelrc     |  3 +++
 .../mirror_rewrite/.bazelversion                   |  2 +-
 .../example_workspaces/mirror_rewrite/MODULE.bazel |  2 +-
 .../multiple_pkl_projects/.bazelrc                 |  3 +++
 .../multiple_pkl_projects/.bazelversion            |  2 +-
 .../multiple_pkl_projects/MODULE.bazel             |  4 ++--
 .../example_workspaces/override_version/.bazelrc   |  3 +++
 .../override_version/.bazelversion                 |  2 +-
 .../example_workspaces/pkl_cache/.bazelrc          |  3 +++
 .../example_workspaces/pkl_cache/.bazelversion     |  2 +-
 .../example_workspaces/pkl_cache/MODULE.bazel      |  6 +++---
 .../example_workspaces/pkl_package/.bazelrc        |  6 ++++++
 .../example_workspaces/pkl_package/BUILD.bazel     |  8 ++++----
 .../pkl_package/pkl_package_basic_test.py          |  4 ++--
 .../pkl_package/pkl_package_strip_prefix_test.py   |  4 ++--
 .../pkl_package_version_override_test.py           |  4 ++--
 .../example_workspaces/pkl_project/.bazelrc        |  3 +++
 .../example_workspaces/pkl_project/.bazelversion   |  2 +-
 .../example_workspaces/pkl_project/MODULE.bazel    |  4 ++--
 .../example_workspaces/simple/.bazelrc             |  3 +++
 .../example_workspaces/simple/.bazelversion        |  2 +-
 .../example_workspaces/simple/MODULE.bazel         |  4 ++--
 26 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index df5119e..47da986 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/MODULE.bazel b/MODULE.bazel
index fee8a0d..b7001fd 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -22,16 +22,16 @@ module(
 )
 
 bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "rules_java", version = "8.15.2")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_java", version = "9.1.0")
 bazel_dep(name = "rules_jvm_external", version = "6.7")
-bazel_dep(name = "rules_shell", version = "0.4.1")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
 bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2", dev_dependency = True)
-bazel_dep(name = "gazelle", version = "0.44.0", dev_dependency = True, repo_name = "bazel_gazelle")
+bazel_dep(name = "gazelle", version = "0.51.0", dev_dependency = True, repo_name = "bazel_gazelle")
 bazel_dep(name = "rules_bazel_integration_test", version = "0.34.0", dev_dependency = True)
-bazel_dep(name = "rules_python", version = "1.4.1", dev_dependency = True)
+bazel_dep(name = "rules_python", version = "1.7.0", dev_dependency = True)
 bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
 
 pkl = use_extension("//pkl/extensions:pkl.bzl", "pkl")
@@ -129,12 +129,14 @@ bazel_binaries = use_extension(
 )
 bazel_binaries.download(version = "7.6.1")
 bazel_binaries.download(version = "8.7.0")
+bazel_binaries.download(version = "9.1.0")
 use_repo(
     bazel_binaries,
     "bazel_binaries",
     "bazel_binaries_bazelisk",
     "build_bazel_bazel_7_6_1",
     "build_bazel_bazel_8_7_0",
+    "build_bazel_bazel_9_1_0",
 )
 
 hawkeye = use_extension("//tools/lint/hawkeye:extensions.bzl", "hawkeye", dev_dependency = True)
diff --git a/examples/pkl_project/.bazelversion b/examples/pkl_project/.bazelversion
index df5119e..47da986 100644
--- a/examples/pkl_project/.bazelversion
+++ b/examples/pkl_project/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/scripts/prep-bcr-pr.sh b/scripts/prep-bcr-pr.sh
index f188f6c..483f14b 100755
--- a/scripts/prep-bcr-pr.sh
+++ b/scripts/prep-bcr-pr.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ cat >"${INPUT_JSON}" <<EOF
     "compatibility_level": "1",
     "deps": [],
     "matrix_platforms": ["debian11", "ubuntu2204", "macos", "macos_arm64"],
-    "matrix_bazel_versions": ["8.x", "7.x"],
+    "matrix_bazel_versions": ["9.x", "8.x", "7.x"],
     "module_dot_bazel": "${RULES_PKL_DIR}/MODULE.bazel",
     "name": "rules_pkl",
     "patches": [],
diff --git a/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelrc b/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelrc
index 9c38603..2e9f361 100644
--- a/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelrc
+++ b/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelrc
@@ -1,3 +1,6 @@
 common --enable_bzlmod
 
+# Required to load rules_java 9.x under Bazel 7 (default in Bazel 8+).
+common --experimental_rule_extension_api
+
 test --test_output=errors
diff --git a/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelversion b/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelversion
index df5119e..47da986 100644
--- a/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelversion
+++ b/tests/integration_tests/example_workspaces/mirror_rewrite/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/tests/integration_tests/example_workspaces/mirror_rewrite/MODULE.bazel b/tests/integration_tests/example_workspaces/mirror_rewrite/MODULE.bazel
index 0108b63..c5b655f 100644
--- a/tests/integration_tests/example_workspaces/mirror_rewrite/MODULE.bazel
+++ b/tests/integration_tests/example_workspaces/mirror_rewrite/MODULE.bazel
@@ -18,7 +18,7 @@ local_path_override(
     path = "../../../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
 
 pkl = use_extension("@rules_pkl//pkl/extensions:pkl.bzl", "pkl")
 pkl.project(
diff --git a/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelrc b/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelrc
index 9c38603..2e9f361 100644
--- a/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelrc
+++ b/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelrc
@@ -1,3 +1,6 @@
 common --enable_bzlmod
 
+# Required to load rules_java 9.x under Bazel 7 (default in Bazel 8+).
+common --experimental_rule_extension_api
+
 test --test_output=errors
diff --git a/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelversion b/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelversion
index df5119e..47da986 100644
--- a/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelversion
+++ b/tests/integration_tests/example_workspaces/multiple_pkl_projects/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/tests/integration_tests/example_workspaces/multiple_pkl_projects/MODULE.bazel b/tests/integration_tests/example_workspaces/multiple_pkl_projects/MODULE.bazel
index c78b0be..cadd140 100644
--- a/tests/integration_tests/example_workspaces/multiple_pkl_projects/MODULE.bazel
+++ b/tests/integration_tests/example_workspaces/multiple_pkl_projects/MODULE.bazel
@@ -1,4 +1,4 @@
-# Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ local_path_override(
     path = "../../../..",
 )
 
-bazel_dep(name = "rules_shell", version = "0.4.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
 pkl = use_extension("@rules_pkl//pkl/extensions:pkl.bzl", "pkl")
 pkl.project(
diff --git a/tests/integration_tests/example_workspaces/override_version/.bazelrc b/tests/integration_tests/example_workspaces/override_version/.bazelrc
index 9c38603..2e9f361 100644
--- a/tests/integration_tests/example_workspaces/override_version/.bazelrc
+++ b/tests/integration_tests/example_workspaces/override_version/.bazelrc
@@ -1,3 +1,6 @@
 common --enable_bzlmod
 
+# Required to load rules_java 9.x under Bazel 7 (default in Bazel 8+).
+common --experimental_rule_extension_api
+
 test --test_output=errors
diff --git a/tests/integration_tests/example_workspaces/override_version/.bazelversion b/tests/integration_tests/example_workspaces/override_version/.bazelversion
index df5119e..47da986 100644
--- a/tests/integration_tests/example_workspaces/override_version/.bazelversion
+++ b/tests/integration_tests/example_workspaces/override_version/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/tests/integration_tests/example_workspaces/pkl_cache/.bazelrc b/tests/integration_tests/example_workspaces/pkl_cache/.bazelrc
index 9c38603..2e9f361 100644
--- a/tests/integration_tests/example_workspaces/pkl_cache/.bazelrc
+++ b/tests/integration_tests/example_workspaces/pkl_cache/.bazelrc
@@ -1,3 +1,6 @@
 common --enable_bzlmod
 
+# Required to load rules_java 9.x under Bazel 7 (default in Bazel 8+).
+common --experimental_rule_extension_api
+
 test --test_output=errors
diff --git a/tests/integration_tests/example_workspaces/pkl_cache/.bazelversion b/tests/integration_tests/example_workspaces/pkl_cache/.bazelversion
index df5119e..47da986 100644
--- a/tests/integration_tests/example_workspaces/pkl_cache/.bazelversion
+++ b/tests/integration_tests/example_workspaces/pkl_cache/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/tests/integration_tests/example_workspaces/pkl_cache/MODULE.bazel b/tests/integration_tests/example_workspaces/pkl_cache/MODULE.bazel
index f0b737d..c4e42be 100644
--- a/tests/integration_tests/example_workspaces/pkl_cache/MODULE.bazel
+++ b/tests/integration_tests/example_workspaces/pkl_cache/MODULE.bazel
@@ -1,4 +1,4 @@
-# Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ local_path_override(
     path = "../../../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
-bazel_dep(name = "rules_shell", version = "0.4.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
 bazel_dep(name = "rules_python", version = "1.4.1", dev_dependency = True)
 
diff --git a/tests/integration_tests/example_workspaces/pkl_package/.bazelrc b/tests/integration_tests/example_workspaces/pkl_package/.bazelrc
index e69de29..2e9f361 100644
--- a/tests/integration_tests/example_workspaces/pkl_package/.bazelrc
+++ b/tests/integration_tests/example_workspaces/pkl_package/.bazelrc
@@ -0,0 +1,6 @@
+common --enable_bzlmod
+
+# Required to load rules_java 9.x under Bazel 7 (default in Bazel 8+).
+common --experimental_rule_extension_api
+
+test --test_output=errors
diff --git a/tests/integration_tests/example_workspaces/pkl_package/BUILD.bazel b/tests/integration_tests/example_workspaces/pkl_package/BUILD.bazel
index 36b181f..639ccfa 100644
--- a/tests/integration_tests/example_workspaces/pkl_package/BUILD.bazel
+++ b/tests/integration_tests/example_workspaces/pkl_package/BUILD.bazel
@@ -1,4 +1,4 @@
-# Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ py_test(
         ":pklpackage_basic",
     ],
     deps = [
-        "@bazel_tools//tools/python/runfiles",
+        "@rules_python//python/runfiles",
     ],
 )
 
@@ -69,7 +69,7 @@ py_test(
         ":pklpackage_strip_prefix",
     ],
     deps = [
-        "@bazel_tools//tools/python/runfiles",
+        "@rules_python//python/runfiles",
     ],
 )
 
@@ -80,6 +80,6 @@ py_test(
         ":pklpackage_version_override",
     ],
     deps = [
-        "@bazel_tools//tools/python/runfiles",
+        "@rules_python//python/runfiles",
     ],
 )
diff --git a/tests/integration_tests/example_workspaces/pkl_package/pkl_package_basic_test.py b/tests/integration_tests/example_workspaces/pkl_package/pkl_package_basic_test.py
index 80d6c61..9558245 100644
--- a/tests/integration_tests/example_workspaces/pkl_package/pkl_package_basic_test.py
+++ b/tests/integration_tests/example_workspaces/pkl_package/pkl_package_basic_test.py
@@ -1,4 +1,4 @@
-# Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import tempfile
 
 from pathlib import Path
-from bazel_tools.tools.python.runfiles import runfiles
+from python.runfiles import runfiles
 
 
 class TestPklPackage(unittest.TestCase):
diff --git a/tests/integration_tests/example_workspaces/pkl_package/pkl_package_strip_prefix_test.py b/tests/integration_tests/example_workspaces/pkl_package/pkl_package_strip_prefix_test.py
index 14c3c45..d75cce4 100644
--- a/tests/integration_tests/example_workspaces/pkl_package/pkl_package_strip_prefix_test.py
+++ b/tests/integration_tests/example_workspaces/pkl_package/pkl_package_strip_prefix_test.py
@@ -1,4 +1,4 @@
-# Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import tempfile
 
 from pathlib import Path
-from bazel_tools.tools.python.runfiles import runfiles
+from python.runfiles import runfiles
 
 
 class MyTestCase(unittest.TestCase):
diff --git a/tests/integration_tests/example_workspaces/pkl_package/pkl_package_version_override_test.py b/tests/integration_tests/example_workspaces/pkl_package/pkl_package_version_override_test.py
index bb6fb11..c954521 100644
--- a/tests/integration_tests/example_workspaces/pkl_package/pkl_package_version_override_test.py
+++ b/tests/integration_tests/example_workspaces/pkl_package/pkl_package_version_override_test.py
@@ -1,4 +1,4 @@
-# Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import tempfile
 
 from pathlib import Path
-from bazel_tools.tools.python.runfiles import runfiles
+from python.runfiles import runfiles
 
 
 class TestPklPackage(unittest.TestCase):
diff --git a/tests/integration_tests/example_workspaces/pkl_project/.bazelrc b/tests/integration_tests/example_workspaces/pkl_project/.bazelrc
index 9c38603..2e9f361 100644
--- a/tests/integration_tests/example_workspaces/pkl_project/.bazelrc
+++ b/tests/integration_tests/example_workspaces/pkl_project/.bazelrc
@@ -1,3 +1,6 @@
 common --enable_bzlmod
 
+# Required to load rules_java 9.x under Bazel 7 (default in Bazel 8+).
+common --experimental_rule_extension_api
+
 test --test_output=errors
diff --git a/tests/integration_tests/example_workspaces/pkl_project/.bazelversion b/tests/integration_tests/example_workspaces/pkl_project/.bazelversion
index df5119e..47da986 100644
--- a/tests/integration_tests/example_workspaces/pkl_project/.bazelversion
+++ b/tests/integration_tests/example_workspaces/pkl_project/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/tests/integration_tests/example_workspaces/pkl_project/MODULE.bazel b/tests/integration_tests/example_workspaces/pkl_project/MODULE.bazel
index 1e59347..3b84918 100644
--- a/tests/integration_tests/example_workspaces/pkl_project/MODULE.bazel
+++ b/tests/integration_tests/example_workspaces/pkl_project/MODULE.bazel
@@ -1,4 +1,4 @@
-# Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ local_path_override(
     path = "../../../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
 
 bazel_dep(name = "rules_python", version = "1.4.1", dev_dependency = True)
 
diff --git a/tests/integration_tests/example_workspaces/simple/.bazelrc b/tests/integration_tests/example_workspaces/simple/.bazelrc
index 9c38603..2e9f361 100644
--- a/tests/integration_tests/example_workspaces/simple/.bazelrc
+++ b/tests/integration_tests/example_workspaces/simple/.bazelrc
@@ -1,3 +1,6 @@
 common --enable_bzlmod
 
+# Required to load rules_java 9.x under Bazel 7 (default in Bazel 8+).
+common --experimental_rule_extension_api
+
 test --test_output=errors
diff --git a/tests/integration_tests/example_workspaces/simple/.bazelversion b/tests/integration_tests/example_workspaces/simple/.bazelversion
index df5119e..47da986 100644
--- a/tests/integration_tests/example_workspaces/simple/.bazelversion
+++ b/tests/integration_tests/example_workspaces/simple/.bazelversion
@@ -1 +1 @@
-8.7.0
+9.1.0
diff --git a/tests/integration_tests/example_workspaces/simple/MODULE.bazel b/tests/integration_tests/example_workspaces/simple/MODULE.bazel
index 1f54f2e..db20ab0 100644
--- a/tests/integration_tests/example_workspaces/simple/MODULE.bazel
+++ b/tests/integration_tests/example_workspaces/simple/MODULE.bazel
@@ -1,4 +1,4 @@
-# Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+# Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ local_path_override(
     path = "../../../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
 
 bazel_dep(name = "rules_python", version = "1.4.1", dev_dependency = True)