chore(deps): Add ninja 1.12.0 and latest versions of cmake

bazel-contrib · Apr 11, 2024 · 845e6db · 845e6db
1 parent 5c34b71
commit 845e6db
Show file tree

Hide file tree

Showing 7 changed files with 729 additions and 4 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -30,7 +30,7 @@ use_repo(
     "glib_src",
     "gnumake_src",
     "meson_src",
-    "ninja_1.11.1_toolchains",
+    "ninja_1.12.0_toolchains",
     "ninja_build_src",
     "pkgconfig_src",
     "rules_foreign_cc_framework_toolchains",
@@ -39,7 +39,7 @@ use_repo(
 register_toolchains(
     "@rules_foreign_cc_framework_toolchains//:all",
     "@cmake_3.23.2_toolchains//:all",
-    "@ninja_1.11.1_toolchains//:all",
+    "@ninja_1.12.0_toolchains//:all",
     "@python_3_9//:all",
     "@rules_foreign_cc//toolchains:all",
 )
diff --git a/foreign_cc/extensions.bzl b/foreign_cc/extensions.bzl
@@ -4,7 +4,7 @@ load("//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
 load("//toolchains:prebuilt_toolchains.bzl", "prebuilt_toolchains")
 
 _DEFAULT_CMAKE_VERSION = "3.23.2"
-_DEFAULT_NINJA_VERSION = "1.11.1"
+_DEFAULT_NINJA_VERSION = "1.12.0"
 
 cmake_toolchain_version = tag_class(attrs = {
     "version": attr.string(doc = "The cmake version", default = _DEFAULT_CMAKE_VERSION),

diff --git a/foreign_cc/repositories.bzl b/foreign_cc/repositories.bzl
@@ -11,7 +11,7 @@ def rules_foreign_cc_dependencies(
         register_default_tools = True,
         cmake_version = "3.23.2",
         make_version = "4.4.1",
-        ninja_version = "1.11.1",
+        ninja_version = "1.12.0",
         meson_version = "1.1.1",
         pkgconfig_version = "0.29.2",
         register_preinstalled_tools = True,

diff --git a/toolchains/built_toolchains.bzl b/toolchains/built_toolchains.bzl
@@ -135,6 +135,19 @@ def _ninja_toolchain(version, register_toolchains):
         native.register_toolchains(
             "@rules_foreign_cc//toolchains:built_ninja_toolchain",
         )
+    if version == "1.12.0":
+        maybe(
+            http_archive,
+            name = "ninja_build_src",
+            build_file_content = _ALL_CONTENT,
+            integrity = "sha256-iyyGzUg9x/y3l1xexzKRNdIQCZqJvH2wWQoHsLv+SaU=",
+            strip_prefix = "ninja-1.12.0",
+            urls = [
+                "https://mirror.bazel.build/github.com/ninja-build/ninja/archive/v1.12.0.tar.gz",
+                "https://github.com/ninja-build/ninja/archive/v1.12.0.tar.gz",
+            ],
+        )
+        return
     if version == "1.11.1":
         maybe(
             http_archive,

diff --git a/toolchains/cmake_versions.bzl b/toolchains/cmake_versions.bzl
@@ -510,6 +510,41 @@ CMAKE_SRCS = {
         "cmake-3.28.1",
         "15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad",
     ],
+    "3.28.2": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v3.28.2/cmake-3.28.2.tar.gz",
+        ],
+        "cmake-3.28.2",
+        "1466f872dc1c226f373cf8fba4230ed216a8f108bd54b477b5ccdfd9ea2d124a",
+    ],
+    "3.28.3": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3.tar.gz",
+        ],
+        "cmake-3.28.3",
+        "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1",
+    ],
+    "3.28.4": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v3.28.4/cmake-3.28.4.tar.gz",
+        ],
+        "cmake-3.28.4",
+        "eb9c787e078848dc493f4f83f8a4bbec857cd1f38ab6425ce8d2776a9f6aa6fb",
+    ],
+    "3.29.0": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0.tar.gz",
+        ],
+        "cmake-3.29.0",
+        "a0669630aae7baa4a8228048bf30b622f9e9fd8ee8cedb941754e9e38686c778",
+    ],
+    "3.29.1": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v3.29.1/cmake-3.29.1.tar.gz",
+        ],
+        "cmake-3.29.1",
+        "7fb02e8f57b62b39aa6b4cf71e820148ba1a23724888494735021e32ab0eefcc",
+    ],
     "3.3.2": [
         [
             "https://github.com/Kitware/CMake/releases/download/v3.3.2/cmake-3.3.2.tar.gz",