Upgrade bazel to 8.0.0.

criemen · criemen · commit ce04ea63fe74 · 2024-12-10T11:52:26.000+01:00
Previously, we were using 8.0.0rc1.
In particular, this upgrade means we need to explicitly
import more rules, as they've been moved out of the core bazel repo.
diff --git a/.bazelrc b/.bazelrc
@@ -24,4 +24,7 @@ common --registry=https://bcr.bazel.build
 
 common --@rules_dotnet//dotnet/settings:strict_deps=false
 
+# Require all rules to be loaded from somewhere, except java, which we'll deal with later
+common --incompatible_autoload_externally="+@rules_java"
+
 try-import %workspace%/local.bazelrc
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-8.0.0rc1
+8.0.0
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -18,7 +18,8 @@ bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "rules_go", version = "0.50.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
-bazel_dep(name = "rules_python", version = "0.36.0")
+bazel_dep(name = "rules_python", version = "0.40.0")
+bazel_dep(name = "rules_shell", version = "0.3.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
diff --git a/csharp/scripts/BUILD.bazel b/csharp/scripts/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_binary")
+
 py_binary(
     name = "gen-git-assembly-info",
     srcs = ["gen-git-assembly-info.py"],
diff --git a/go/BUILD.bazel b/go/BUILD.bazel
@@ -1,5 +1,6 @@
 load("@gazelle//:def.bzl", "gazelle")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
+load("@rules_python//python:defs.bzl", "py_binary")
 load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
 
 gazelle(
diff --git a/java/kotlin-extractor/BUILD.bazel b/java/kotlin-extractor/BUILD.bazel
@@ -40,6 +40,7 @@ load(
 )
 load("@rules_kotlin//kotlin:core.bzl", "kt_javac_options", "kt_kotlinc_options")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@rules_python//python:defs.bzl", "py_binary")
 
 package(default_visibility = ["//java/kotlin-extractor:__subpackages__"])
 
diff --git a/misc/codegen/BUILD.bazel b/misc/codegen/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_binary")
+
 py_binary(
     name = "codegen",
     srcs = ["codegen.py"],
diff --git a/misc/codegen/generators/BUILD.bazel b/misc/codegen/generators/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 py_library(
     name = "generators",
     srcs = glob(["*.py"]),
diff --git a/misc/codegen/lib/BUILD.bazel b/misc/codegen/lib/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@codegen_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library")
 
 py_library(
     name = "lib",
diff --git a/misc/codegen/loaders/BUILD.bazel b/misc/codegen/loaders/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@codegen_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library")
 
 py_library(
     name = "loaders",
diff --git a/misc/codegen/test/BUILD.bazel b/misc/codegen/test/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@codegen_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 py_library(
     name = "utils",
diff --git a/misc/ripunzip/BUILD.bazel b/misc/ripunzip/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+
 alias(
     name = "ripunzip",
     actual = select({"@platforms//os:" + os: "@ripunzip-" + os for os in ("linux", "windows", "macos")}),
diff --git a/python/extractor/BUILD.bazel b/python/extractor/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_python//python:defs.bzl", "py_binary")
 load("//misc/bazel:pkg.bzl", "codeql_pkg_files", "strip_prefix")
 
 py_binary(
diff --git a/rust/codegen/BUILD.bazel b/rust/codegen/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 _args = [
     "//rust/ast-generator",
diff --git a/swift/extractor/BUILD.bazel b/swift/extractor/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load("//misc/bazel:pkg.bzl", "codeql_pkg_runfiles")
 load("//swift:rules.bzl", "swift_cc_binary")
 
diff --git a/swift/logging/tests/assertion-diagnostics/BUILD.bazel b/swift/logging/tests/assertion-diagnostics/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_python//python:defs.bzl", "py_test")
 load("//swift:rules.bzl", "swift_cc_binary")
 
 swift_cc_binary(
diff --git a/swift/ql/integration-tests/BUILD.bazel b/swift/ql/integration-tests/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 py_library(
     name = "utils",
     srcs = [
diff --git a/swift/swift-autobuilder/tests/BUILD.bazel b/swift/swift-autobuilder/tests/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_test")
+
 [
     py_test(
         name = test_dir + "-test",
diff --git a/swift/third_party/resource-dir/BUILD.bazel b/swift/third_party/resource-dir/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+
 alias(
     name = "resource-dir",
     actual = select({"@platforms//os:" + os: "@swift-resource-dir-" + os for os in ("linux", "macos")}),
diff --git a/swift/tools/BUILD.bazel b/swift/tools/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load("//misc/bazel:pkg.bzl", "codeql_pkg_files")
 
 sh_binary(
diff --git a/swift/tools/test/qltest/BUILD.bazel b/swift/tools/test/qltest/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
+
 py_library(
     name = "utils",
     srcs = ["utils.py"],

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_python//python:defs.bzl", "py_binary")`
	`2`	`+`
`1`	`3`	`py_binary(`
`2`	`4`	`name = "gen-git-assembly-info",`
`3`	`5`	`srcs = ["gen-git-assembly-info.py"],`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ load(`
`40`	`40`	`)`
`41`	`41`	`load("@rules_kotlin//kotlin:core.bzl", "kt_javac_options", "kt_kotlinc_options")`
`42`	`42`	`load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")`
	`43`	`+load("@rules_python//python:defs.bzl", "py_binary")`
`43`	`44`
`44`	`45`	`package(default_visibility = ["//java/kotlin-extractor:__subpackages__"])`
`45`	`46`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_python//python:defs.bzl", "py_library")`
	`2`	`+`
`1`	`3`	`py_library(`
`2`	`4`	`name = "generators",`
`3`	`5`	`srcs = glob(["*.py"]),`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@codegen_deps//:requirements.bzl", "requirement")`
	`2`	`+load("@rules_python//python:defs.bzl", "py_library")`
`2`	`3`
`3`	`4`	`py_library(`
`4`	`5`	`name = "lib",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")`
	`2`	`+`
`1`	`3`	`alias(`
`2`	`4`	`name = "ripunzip",`
`3`	`5`	`actual = select({"@platforms//os:" + os: "@ripunzip-" + os for os in ("linux", "windows", "macos")}),`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+load("@rules_python//python:defs.bzl", "py_binary")`
`1`	`2`	`load("//misc/bazel:pkg.bzl", "codeql_pkg_files", "strip_prefix")`
`2`	`3`
`3`	`4`	`py_binary(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@bazel_skylib//rules:native_binary.bzl", "native_binary")`
	`2`	`+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")`
`2`	`3`
`3`	`4`	`_args = [`
`4`	`5`	`"//rust/ast-generator",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+load("@rules_python//python:defs.bzl", "py_test")`
`1`	`2`	`load("//swift:rules.bzl", "swift_cc_binary")`
`2`	`3`
`3`	`4`	`swift_cc_binary(`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_python//python:defs.bzl", "py_test")`
	`2`	`+`
`1`	`3`	`[`
`2`	`4`	`py_test(`
`3`	`5`	`name = test_dir + "-test",`