Bazel: 6.5.0 -> 8.0.0

kiron1 · Dec 21, 2024 · 2c9d737 · 2c9d737
1 parent 43a3d7d
commit 2c9d737
Show file tree

Hide file tree

Showing 7 changed files with 1,035 additions and 2,021 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.5.0
+8.0.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ members = [
     "proxydetox",
     "proxydetoxlib",
     "spnego",
+    "tools",
 ]
 default-members = [
     "paceval",

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -3,26 +3,19 @@ module(
     version = "0.0.0",
 )
 
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "rules_rust", version = "0.54.1")
-
 # Apple
-bazel_dep(name = "apple_support", version = "1.16.0", repo_name = "build_bazel_apple_support")
-bazel_dep(name = "rules_apple", version = "3.6.0", repo_name = "build_bazel_rules_apple")
-bazel_dep(name = "rules_swift", version = "2.1.1", repo_name = "build_bazel_rules_swift")
-
-apple_cc_configure = use_extension(
-    "@build_bazel_apple_support//crosstool:setup.bzl",
-    "apple_cc_configure_extension",
-)
-use_repo(apple_cc_configure, "local_config_apple_cc", "local_config_apple_cc_toolchains")
+bazel_dep(name = "apple_support", version = "1.17.1", repo_name = "build_bazel_apple_support")  # apple_support must come above rules_cc
+bazel_dep(name = "rules_apple", version = "3.16.1", repo_name = "build_bazel_rules_apple")
+bazel_dep(name = "rules_swift", version = "2.3.1", repo_name = "build_bazel_rules_swift")
 
-# register_toolchains("@local_config_apple_cc_toolchains//:all")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_cc", version = "0.1.0")
+bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "rules_rust", version = "0.56.0")
 
-cc_configure = use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension")
-use_repo(cc_configure, "local_config_cc_toolchains")
+cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
+use_repo(cc_configure, "local_config_cc", "local_config_cc_toolchains")
 
 register_toolchains("@local_config_cc_toolchains//:all")
 
@@ -54,12 +47,7 @@ crate.from_cargo(
         "//proxydetox:Cargo.toml",
         "//proxydetoxlib:Cargo.toml",
         "//spnego:Cargo.toml",
+        "//tools:Cargo.toml",
     ],
 )
 use_repo(crate, "crate_index")
-crate.from_cargo(
-    name = "crate_index_tools",
-    cargo_lockfile = "//tools:Cargo.lock",
-    manifests = ["//tools:Cargo.toml"],
-)
-use_repo(crate, "crate_index_tools")