Upgrade Bazel to 9.0.0 #21276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

redsun82 wants to merge 10 commits into main from redsun82/bazel-9

+37 −13

.bazelrc

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,8 @@ build --compilation_mode opt @@
     common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
     build --repo_env=CC=clang --repo_env=CXX=clang++
+    # Disable Android SDK auto-detection (we don't use it, and rules_android has Bazel 9 compatibility issues)
+    build --repo_env=ANDROID_HOME=
     # print test output, like sembuild does.
     # Set to `errors` if this is too verbose.
@@ Expand All / @@ -34,7 +36,7 @@ common --@rules_dotnet//dotnet/settings:strict_deps=false @@
     common --@rules_rust//rust/toolchain/channel=nightly
     # 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
-    common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
+    common --incompatible_autoload_externally="+@rules_cc,+@rules_java,+@rules_shell"
     build --java_language_version=17
     build --tool_java_language_version=17
@@ Expand Down @@

.bazelversion

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8.4.2
		9.0.0

MODULE.bazel

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,17 +15,19 @@ local_path_override(
  
    # see https://registry.bazel.build/ for a list of available packages

    bazel_dep(name = "platforms", version = "1.0.0")

    bazel_dep(name = "rules_go", version = "0.56.1")

    bazel_dep(name = "rules_cc", version = "0.2.16")

    bazel_dep(name = "rules_go", version = "0.59.0")

    bazel_dep(name = "rules_java", version = "9.0.3")

    bazel_dep(name = "rules_pkg", version = "1.0.1")

    bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")

    bazel_dep(name = "rules_nodejs", version = "6.7.3")

    bazel_dep(name = "rules_python", version = "0.40.0")

    bazel_dep(name = "rules_shell", version = "0.5.0")

    bazel_dep(name = "bazel_skylib", version = "1.8.1")

    bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl")

    bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")

    bazel_dep(name = "fmt", version = "12.1.0-codeql.1")

    bazel_dep(name = "rules_kotlin", version = "2.2.0-codeql.1")

    bazel_dep(name = "gazelle", version = "0.40.0")

    bazel_dep(name = "gazelle", version = "0.47.0")

    bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")

    bazel_dep(name = "googletest", version = "1.14.0.bcr.1")

    bazel_dep(name = "rules_rust", version = "0.66.0")

    @@ -188,6 +190,15 @@ pip.parse(
  
    )

    use_repo(pip, "codegen_deps")

    python = use_extension("@rules_python//python/extensions:python.bzl", "python")

    python.toolchain(

        is_default = True,

        python_version = "3.12",

    )

    use_repo(python, "python_3_12", "python_versions")

    register_toolchains("@python_versions//3.12:all")

    swift_deps = use_extension("//swift/third_party:load.bzl", "swift_deps")

    # following list can be kept in sync with `bazel mod tidy`

javascript/extractor/BUILD.bazel

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    load("@rules_java//java:defs.bzl", "java_library")
     load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
     load("@semmle_code//:common.bzl", "codeql_fat_jar", "codeql_java_project")
@@ Expand Down @@

javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    load("@rules_java//java:defs.bzl", "java_test")
     java_test(
         name = "test",
         srcs = glob(["**/*.java"]),
@@ Expand Down @@

misc/bazel/cmake/cmake.bzl

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
     CmakeInfo = provider(
         fields = {
             "name": "",
@@ Expand Down @@

misc/bazel/internal/zipmerge/BUILD.bazel

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
     cc_library(
         name = "lib",
         srcs = [
@@ Expand Down Expand Up / @@ -28,7 +30,7 @@ cc_test( @@
         linkstatic = True,  # required to build the test in the internal repo
         deps = [
             ":lib",
-            "@bazel_tools//tools/cpp/runfiles",
             "@googletest//:gtest_main",
+            "@rules_cc//cc/runfiles",
         ],
     )

misc/bazel/internal/zipmerge/zipmerge_test.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,9 +9,9 @@
  
    #include <gtest/gtest.h>

    #include <gmock/gmock.h>

    #include "tools/cpp/runfiles/runfiles.h"

    #include "rules_cc/cc/runfiles/runfiles.h"

    using bazel::tools::cpp::runfiles::Runfiles;

    using rules_cc::cc::runfiles::Runfiles;

    using namespace std::string_literals;

    namespace fs = std::filesystem;

misc/bazel/registry/modules/rules_nodejs/metadata.json

-Original file line number
+Diff line change
@@ -1,5 +1,3 @@
     {
         "versions": [
-            "6.2.0-codeql.1"
-        ]
-    }
+        "6.2.0-codeql.1"

shared/cpp/BUILD.bazel

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    load("@rules_cc//cc:defs.bzl", "cc_library")
     cc_library(
         name = "extractor_shared",
         srcs = glob(["*.cpp"]),
@@ Expand Down @@

swift/logging/BUILD.bazel

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    load("@rules_cc//cc:defs.bzl", "cc_library")
     cc_library(
         name = "logging",
         srcs = glob(["*.cpp"]),
@@ Expand Down @@

swift/rules.bzl

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
+    load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
     load("//misc/bazel:os.bzl", "os_select")
     # TODO: make a shared library with the internal repos for transitions
@@ Expand Down Expand Up / @@ -124,7 +126,7 @@ def _wrap_cc(rule, kwargs): @@
         )
     def swift_cc_binary(**kwargs):
-        _wrap_cc(native.cc_binary, kwargs)
+        _wrap_cc(cc_binary, kwargs)
     def swift_cc_library(**kwargs):
-        _wrap_cc(native.cc_library, kwargs)
+        _wrap_cc(cc_library, kwargs)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade Bazel to 9.0.0 #21276

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Upgrade Bazel to 9.0.0 #21276

Are you sure you want to change the base?

Upgrade Bazel to 9.0.0 #21276

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!