Skip to content

Commit f097168

Browse files
authored
Merge pull request #18257 from github/criemen/bazel-8-00
Upgrade bazel to 8.0.0.
2 parents a36d226 + 53ca508 commit f097168

File tree

22 files changed

+42
-5
lines changed

22 files changed

+42
-5
lines changed

.bazelrc

+8
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,12 @@ common --registry=https://bcr.bazel.build
2424

2525
common --@rules_dotnet//dotnet/settings:strict_deps=false
2626

27+
# Reduce this eventually to empty, once we've fixed all our usages of java, and https://github.com/bazel-contrib/rules_go/issues/4193 is fixed
28+
common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
29+
30+
build --java_language_version=17
31+
build --tool_java_language_version=17
32+
build --tool_java_runtime_version=remotejdk_17
33+
build --java_runtime_version=remotejdk_17
34+
2735
try-import %workspace%/local.bazelrc

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0rc1
1+
8.0.0

MODULE.bazel

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@ local_path_override(
1515
# see https://registry.bazel.build/ for a list of available packages
1616

1717
bazel_dep(name = "platforms", version = "0.0.10")
18-
bazel_dep(name = "rules_go", version = "0.50.0")
18+
bazel_dep(name = "rules_go", version = "0.50.1")
1919
bazel_dep(name = "rules_pkg", version = "1.0.1")
2020
bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
21-
bazel_dep(name = "rules_python", version = "0.36.0")
21+
bazel_dep(name = "rules_python", version = "0.40.0")
22+
bazel_dep(name = "rules_shell", version = "0.3.0")
2223
bazel_dep(name = "bazel_skylib", version = "1.7.1")
23-
bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
24+
bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl")
2425
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2526
bazel_dep(name = "fmt", version = "10.0.0")
2627
bazel_dep(name = "rules_kotlin", version = "2.0.0-codeql.1")
27-
bazel_dep(name = "gazelle", version = "0.38.0")
28+
bazel_dep(name = "gazelle", version = "0.40.0")
2829
bazel_dep(name = "rules_dotnet", version = "0.17.4")
2930
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
3031
bazel_dep(name = "rules_rust", version = "0.52.2")

csharp/scripts/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_python//python:defs.bzl", "py_binary")
2+
13
py_binary(
24
name = "gen-git-assembly-info",
35
srcs = ["gen-git-assembly-info.py"],

go/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
load("@gazelle//:def.bzl", "gazelle")
22
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
3+
load("@rules_python//python:defs.bzl", "py_binary")
34
load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
45

56
gazelle(

java/kotlin-extractor/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ load(
4040
)
4141
load("@rules_kotlin//kotlin:core.bzl", "kt_javac_options", "kt_kotlinc_options")
4242
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
43+
load("@rules_python//python:defs.bzl", "py_binary")
4344

4445
package(default_visibility = ["//java/kotlin-extractor:__subpackages__"])
4546

misc/bazel/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_shell//shell:sh_library.bzl", "sh_library")
2+
13
sh_library(
24
name = "sh_runfiles",
35
srcs = ["runfiles.sh"],

misc/codegen/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_python//python:defs.bzl", "py_binary")
2+
13
py_binary(
24
name = "codegen",
35
srcs = ["codegen.py"],

misc/codegen/generators/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_python//python:defs.bzl", "py_library")
2+
13
py_library(
24
name = "generators",
35
srcs = glob(["*.py"]),

misc/codegen/lib/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@codegen_deps//:requirements.bzl", "requirement")
2+
load("@rules_python//python:defs.bzl", "py_library")
23

34
py_library(
45
name = "lib",

misc/codegen/loaders/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@codegen_deps//:requirements.bzl", "requirement")
2+
load("@rules_python//python:defs.bzl", "py_library")
23

34
py_library(
45
name = "loaders",

misc/codegen/test/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@codegen_deps//:requirements.bzl", "requirement")
2+
load("@rules_python//python:defs.bzl", "py_library", "py_test")
23

34
py_library(
45
name = "utils",

misc/ripunzip/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
2+
13
alias(
24
name = "ripunzip",
35
actual = select({"@platforms//os:" + os: "@ripunzip-" + os for os in ("linux", "windows", "macos")}),

python/extractor/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_python//python:defs.bzl", "py_binary")
12
load("//misc/bazel:pkg.bzl", "codeql_pkg_files", "strip_prefix")
23

34
py_binary(

rust/codegen/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
2+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
23

34
_args = [
45
"//rust/ast-generator",

swift/extractor/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
12
load("//misc/bazel:pkg.bzl", "codeql_pkg_runfiles")
23
load("//swift:rules.bzl", "swift_cc_binary")
34

swift/logging/tests/assertion-diagnostics/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_python//python:defs.bzl", "py_test")
12
load("//swift:rules.bzl", "swift_cc_binary")
23

34
swift_cc_binary(

swift/ql/integration-tests/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_python//python:defs.bzl", "py_library")
2+
13
py_library(
24
name = "utils",
35
srcs = [

swift/swift-autobuilder/tests/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_python//python:defs.bzl", "py_test")
2+
13
[
24
py_test(
35
name = test_dir + "-test",

swift/third_party/resource-dir/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
2+
13
alias(
24
name = "resource-dir",
35
actual = select({"@platforms//os:" + os: "@swift-resource-dir-" + os for os in ("linux", "macos")}),

swift/tools/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
12
load("//misc/bazel:pkg.bzl", "codeql_pkg_files")
23

34
sh_binary(

swift/tools/test/qltest/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_python//python:defs.bzl", "py_library", "py_test")
2+
13
py_library(
24
name = "utils",
35
srcs = ["utils.py"],

0 commit comments

Comments
 (0)