BUILD.bazel

@@ -138,19 +138,19 @@ cc_library(
     }),
     deps = select({
         ":has_absl": [
-            "@abseil-cpp//absl/container:flat_hash_set",
-            "@abseil-cpp//absl/debugging:failure_signal_handler",
-            "@abseil-cpp//absl/debugging:stacktrace",
-            "@abseil-cpp//absl/debugging:symbolize",
-            "@abseil-cpp//absl/flags:flag",
-            "@abseil-cpp//absl/flags:parse",
-            "@abseil-cpp//absl/flags:reflection",
-            "@abseil-cpp//absl/flags:usage",
-            "@abseil-cpp//absl/strings",
-            "@abseil-cpp//absl/types:any",
-            "@abseil-cpp//absl/types:optional",
-            "@abseil-cpp//absl/types:variant",
-            "@re2//:re2",
+            "@com_google_absl//absl/container:flat_hash_set",
+            "@com_google_absl//absl/debugging:failure_signal_handler",
+            "@com_google_absl//absl/debugging:stacktrace",
+            "@com_google_absl//absl/debugging:symbolize",
+            "@com_google_absl//absl/flags:flag",
+            "@com_google_absl//absl/flags:parse",
+            "@com_google_absl//absl/flags:reflection",
+            "@com_google_absl//absl/flags:usage",
+            "@com_google_absl//absl/strings",
+            "@com_google_absl//absl/types:any",
+            "@com_google_absl//absl/types:optional",
+            "@com_google_absl//absl/types:variant",
+            "@com_googlesource_code_re2//:re2",
         ],
         "//conditions:default": [],
     }) + select({

CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 project(googletest-distribution)
-set(GOOGLETEST_VERSION 1.15.2)
+set(GOOGLETEST_VERSION 1.14.0)
 
 if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
   set(CMAKE_CXX_EXTENSIONS OFF)

MODULE.bazel

@@ -40,28 +40,22 @@ module(
 # Please keep the versions in sync with the versions in the WORKSPACE file.
 
 bazel_dep(name = "abseil-cpp",
-          version = "20240116.2")
+          version = "20240116.2",
+          repo_name = "com_google_absl")
 
 bazel_dep(name = "platforms",
           version = "0.0.10")
 
 bazel_dep(name = "re2",
+          repo_name = "com_googlesource_code_re2",
           version = "2024-07-02")
 
 bazel_dep(name = "rules_python",
-          version = "0.34.0",
-          dev_dependency = True)
+          version = "0.29.0")
 
-# https://rules-python.readthedocs.io/en/stable/toolchains.html#library-modules-with-dev-only-python-usage
-python = use_extension(
-    "@rules_python//python/extensions:python.bzl",
-    "python",
-    dev_dependency = True
-)
-
-python.toolchain(python_version = "3.12",
-                 is_default = True,
-                 ignore_root_user_error = True)
 
 fake_fuchsia_sdk = use_repo_rule("//:fake_fuchsia_sdk.bzl", "fake_fuchsia_sdk")
 fake_fuchsia_sdk(name = "fuchsia_sdk")
+
+# https://github.com/bazelbuild/rules_python/blob/main/BZLMOD_SUPPORT.md#default-toolchain-is-not-the-local-system-python
+register_toolchains("@bazel_tools//tools/python:autodetecting_toolchain")

README.md

@@ -9,7 +9,7 @@ GoogleTest now follows the
 We recommend
 [updating to the latest commit in the `main` branch as often as possible](https://github.com/abseil/abseil-cpp/blob/master/FAQ.md#what-is-live-at-head-and-how-do-i-do-it).
 We do publish occasional semantic versions, tagged with
-`v${major}.${minor}.${patch}` (e.g. `v1.15.2`).
+`v${major}.${minor}.${patch}` (e.g. `v1.14.0`).
 
 #### Documentation Updates
 
@@ -17,12 +17,12 @@ Our documentation is now live on GitHub Pages at
 https://google.github.io/googletest/. We recommend browsing the documentation on
 GitHub Pages rather than directly in the repository.
 
-#### Release 1.15.2
+#### Release 1.14.0
 
-[Release 1.15.2](https://github.com/google/googletest/releases/tag/v1.15.2) is
+[Release 1.14.0](https://github.com/google/googletest/releases/tag/v1.14.0) is
 now available.
 
-The 1.15.x branch requires at least C++14.
+The 1.14.x branch requires at least C++14.
 
 #### Continuous Integration
 

WORKSPACE

@@ -1,34 +1,4 @@
-# Copyright 2024 Google Inc.
-# All Rights Reserved.
-#
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-workspace(name = "googletest")
+workspace(name = "com_google_googletest")
 
 load("//:googletest_deps.bzl", "googletest_deps")
 googletest_deps()

ci/windows-presubmit.bat

@@ -46,13 +46,8 @@ RMDIR /S /Q cmake_msvc2022
 :: ----------------------------------------------------------------------------
 :: Bazel
 
-:: The default home directory on Kokoro is a long path which causes errors
-:: because of Windows limitations on path length.
-:: --output_user_root=C:\tmp causes Bazel to use a shorter path.
 SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community
-%BAZEL_EXE% ^
-  --output_user_root=C:\tmp ^
-  test ... ^
+%BAZEL_EXE% test ... ^
   --compilation_mode=dbg ^
   --copt=/std:c++14 ^
   --copt=/WX ^

docs/quickstart-bazel.md

@@ -10,8 +10,8 @@ To complete this tutorial, you'll need:
 
 *   A compatible operating system (e.g. Linux, macOS, Windows).
 *   A compatible C++ compiler that supports at least C++14.
-*   [Bazel](https://bazel.build/) 7.0 or higher, the preferred build system used
-    by the GoogleTest team.
+*   [Bazel](https://bazel.build/), the preferred build system used by the
+    GoogleTest team.
 
 See [Supported Platforms](platforms.md) for more information about platforms
 compatible with GoogleTest.
@@ -28,7 +28,7 @@ A
 [Bazel workspace](https://docs.bazel.build/versions/main/build-ref.html#workspace)
 is a directory on your filesystem that you use to manage source files for the
 software you want to build. Each workspace directory has a text file named
-`MODULE.bazel` which may be empty, or may contain references to external
+`WORKSPACE` which may be empty, or may contain references to external
 dependencies required to build the outputs.
 
 First, create a directory for your workspace:
@@ -37,20 +37,30 @@ First, create a directory for your workspace:
 $ mkdir my_workspace && cd my_workspace
 ```
 
-Next, you’ll create the `MODULE.bazel` file to specify dependencies. As of Bazel
-7.0, the recommended way to consume GoogleTest is through the
-[Bazel Central Registry](https://registry.bazel.build/modules/googletest). To do
-this, create a `MODULE.bazel` file in the root directory of your Bazel workspace
-with the following content:
+Next, you’ll create the `WORKSPACE` file to specify dependencies. A common and
+recommended way to depend on GoogleTest is to use a
+[Bazel external dependency](https://docs.bazel.build/versions/main/external.html)
+via the
+[`http_archive` rule](https://docs.bazel.build/versions/main/repo/http.html#http_archive).
+To do this, in the root directory of your workspace (`my_workspace/`), create a
+file named `WORKSPACE` with the following contents:
 
 ```
-# MODULE.bazel
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# Choose the most recent version available at
-# https://registry.bazel.build/modules/googletest
-bazel_dep(name = "googletest", version = "1.15.2")
+http_archive(
+  name = "com_google_googletest",
+  urls = ["https://github.com/google/googletest/archive/5ab508a01f9eb089207ee87fd547d290da39d015.zip"],
+  strip_prefix = "googletest-5ab508a01f9eb089207ee87fd547d290da39d015",
+)
 ```
 
+The above configuration declares a dependency on GoogleTest which is downloaded
+as a ZIP archive from GitHub. In the above example,
+`5ab508a01f9eb089207ee87fd547d290da39d015` is the Git commit hash of the
+GoogleTest version to use; we recommend updating the hash often to point to the
+latest version. Use a recent hash on the `main` branch.
+
 Now you're ready to build C++ code that uses GoogleTest.
 
 ## Create and run a binary
@@ -85,17 +95,14 @@ cc_test(
   name = "hello_test",
   size = "small",
   srcs = ["hello_test.cc"],
-    deps = [
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+  deps = ["@com_google_googletest//:gtest_main"],
 )
 ```
 
 This `cc_test` rule declares the C++ test binary you want to build, and links to
-the GoogleTest library (`@googletest//:gtest"`) and the GoogleTest `main()`
-function (`@googletest//:gtest_main`). For more information about Bazel `BUILD`
-files, see the
+GoogleTest (`//:gtest_main`) using the prefix you specified in the `WORKSPACE`
+file (`@com_google_googletest`). For more information about Bazel `BUILD` files,
+see the
 [Bazel C++ Tutorial](https://docs.bazel.build/versions/main/tutorial/cpp.html).
 
 {: .callout .note}
@@ -108,7 +115,7 @@ on supported language versions.
 Now you can build and run your test:
 
 <pre>
-<strong>$ bazel test --cxxopt=-std=c++14 --test_output=all //:hello_test</strong>
+<strong>my_workspace$ bazel test --cxxopt=-std=c++14 --test_output=all //:hello_test</strong>
 INFO: Analyzed target //:hello_test (26 packages loaded, 362 targets configured).
 INFO: Found 1 test target...
 INFO: From Testing //:hello_test:

googlemock/include/gmock/gmock-actions.h

@@ -1493,7 +1493,6 @@ class DoAllAction<FinalAction> {
   // providing a call operator because even with a particular set of arguments
   // they don't have a fixed return type.
 
-  // We support conversion to OnceAction whenever the sub-action does.
   template <typename R, typename... Args,
             typename std::enable_if<
                 std::is_convertible<FinalAction, OnceAction<R(Args...)>>::value,
@@ -1502,21 +1501,6 @@ class DoAllAction<FinalAction> {
     return std::move(final_action_);
   }
 
-  // We also support conversion to OnceAction whenever the sub-action supports
-  // conversion to Action (since any Action can also be a OnceAction).
-  template <
-      typename R, typename... Args,
-      typename std::enable_if<
-          conjunction<
-              negation<
-                  std::is_convertible<FinalAction, OnceAction<R(Args...)>>>,
-              std::is_convertible<FinalAction, Action<R(Args...)>>>::value,
-          int>::type = 0>
-  operator OnceAction<R(Args...)>() && {  // NOLINT
-    return Action<R(Args...)>(std::move(final_action_));
-  }
-
-  // We support conversion to Action whenever the sub-action does.
   template <
       typename R, typename... Args,
       typename std::enable_if<
@@ -1596,12 +1580,12 @@ class DoAllAction<InitialAction, OtherActions...>
       : Base({}, std::forward<U>(other_actions)...),
         initial_action_(std::forward<T>(initial_action)) {}
 
-  // We support conversion to OnceAction whenever both the initial action and
-  // the rest support conversion to OnceAction.
-  template <
-      typename R, typename... Args,
+  template <typename R, typename... Args,
             typename std::enable_if<
-          conjunction<std::is_convertible<
+                conjunction<
+                    // Both the initial action and the rest must support
+                    // conversion to OnceAction.
+                    std::is_convertible<
                         InitialAction,
                         OnceAction<void(InitialActionArgType<Args>...)>>,
                     std::is_convertible<Base, OnceAction<R(Args...)>>>::value,
@@ -1628,34 +1612,12 @@ class DoAllAction<InitialAction, OtherActions...>
     };
   }
 
-  // We also support conversion to OnceAction whenever the initial action
-  // supports conversion to Action (since any Action can also be a OnceAction).
-  //
-  // The remaining sub-actions must also be compatible, but we don't need to
-  // special case them because the base class deals with them.
-  template <
-      typename R, typename... Args,
-      typename std::enable_if<
-          conjunction<
-              negation<std::is_convertible<
-                  InitialAction,
-                  OnceAction<void(InitialActionArgType<Args>...)>>>,
-              std::is_convertible<InitialAction,
-                                  Action<void(InitialActionArgType<Args>...)>>,
-              std::is_convertible<Base, OnceAction<R(Args...)>>>::value,
-          int>::type = 0>
-  operator OnceAction<R(Args...)>() && {  // NOLINT
-    return DoAll(
-        Action<void(InitialActionArgType<Args>...)>(std::move(initial_action_)),
-        std::move(static_cast<Base&>(*this)));
-  }
-
-  // We support conversion to Action whenever both the initial action and the
-  // rest support conversion to Action.
   template <
       typename R, typename... Args,
       typename std::enable_if<
           conjunction<
+              // Both the initial action and the rest must support conversion to
+              // Action.
               std::is_convertible<const InitialAction&,
                                   Action<void(InitialActionArgType<Args>...)>>,
               std::is_convertible<const Base&, Action<R(Args...)>>>::value,
@@ -1703,8 +1665,7 @@ template <size_t k>
 struct ReturnArgAction {
   template <typename... Args,
             typename = typename std::enable_if<(k < sizeof...(Args))>::type>
-  auto operator()(Args&&... args) const
-      -> decltype(std::get<k>(
+  auto operator()(Args&&... args) const -> decltype(std::get<k>(
       std::forward_as_tuple(std::forward<Args>(args)...))) {
     return std::get<k>(std::forward_as_tuple(std::forward<Args>(args)...));
   }

googlemock/include/gmock/gmock-more-actions.h

@@ -601,8 +601,7 @@ template <std::size_t index, typename... Params>
 struct InvokeArgumentAction {
   template <typename... Args,
             typename = typename std::enable_if<(index < sizeof...(Args))>::type>
-  auto operator()(Args &&...args) const
-      -> decltype(internal::InvokeArgument(
+  auto operator()(Args &&...args) const -> decltype(internal::InvokeArgument(
       std::get<index>(std::forward_as_tuple(std::forward<Args>(args)...)),
       std::declval<const Params &>()...)) {
     internal::FlatTuple<Args &&...> args_tuple(FlatTupleConstructTag{},

googlemock/include/gmock/gmock-spec-builders.h

@@ -1838,8 +1838,9 @@ R FunctionMocker<R(Args...)>::InvokeWith(ArgumentTuple&& args)
     // Doing so slows down compilation dramatically because the *constructor* of
     // std::function<T> is re-instantiated with different template
     // parameters each time.
-    const UninterestingCallCleanupHandler report_uninteresting_call = {reaction,
-                                                                       ss};
+    const UninterestingCallCleanupHandler report_uninteresting_call = {
+        reaction, ss
+    };
 
     return PerformActionAndPrintResult(nullptr, std::move(args), ss.str(), ss);
   }
@@ -1889,7 +1890,8 @@ R FunctionMocker<R(Args...)>::InvokeWith(ArgumentTuple&& args)
   // std::function<T> is re-instantiated with different template
   // parameters each time.
   const FailureCleanupHandler handle_failures = {
-      ss, why, loc, untyped_expectation, found, is_excessive};
+      ss, why, loc, untyped_expectation, found, is_excessive
+  };
 
   return PerformActionAndPrintResult(untyped_action, std::move(args), ss.str(),
                                      ss);

googlemock/include/gmock/internal/gmock-port.h

@@ -42,7 +42,6 @@
 
 #include <assert.h>
 #include <stdlib.h>
-
 #include <cstdint>
 #include <iostream>
 

googlemock/src/gmock-cardinalities.cc

@@ -53,12 +53,12 @@ class BetweenCardinalityImpl : public CardinalityInterface {
       : min_(min >= 0 ? min : 0), max_(max >= min_ ? max : min_) {
     std::stringstream ss;
     if (min < 0) {
-      ss << "The invocation lower bound must be >= 0, " << "but is actually "
-         << min << ".";
+      ss << "The invocation lower bound must be >= 0, "
+         << "but is actually " << min << ".";
       internal::Expect(false, __FILE__, __LINE__, ss.str());
     } else if (max < 0) {
-      ss << "The invocation upper bound must be >= 0, " << "but is actually "
-         << max << ".";
+      ss << "The invocation upper bound must be >= 0, "
+         << "but is actually " << max << ".";
       internal::Expect(false, __FILE__, __LINE__, ss.str());
     } else if (min > max) {
       ss << "The invocation upper bound (" << max

googlemock/test/gmock-actions_test.cc

@@ -441,8 +441,8 @@ TEST(DefaultValueDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
 
   EXPECT_EQ(0, DefaultValue<int>::Get());
 
-  EXPECT_DEATH_IF_SUPPORTED(
-      { DefaultValue<MyNonDefaultConstructible>::Get(); }, "");
+  EXPECT_DEATH_IF_SUPPORTED({ DefaultValue<MyNonDefaultConstructible>::Get(); },
+                            "");
 }
 
 TEST(DefaultValueTest, GetWorksForMoveOnlyIfSet) {
@@ -505,8 +505,8 @@ TEST(DefaultValueOfReferenceDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
   EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet());
 
   EXPECT_DEATH_IF_SUPPORTED({ DefaultValue<int&>::Get(); }, "");
-  EXPECT_DEATH_IF_SUPPORTED(
-      { DefaultValue<MyNonDefaultConstructible>::Get(); }, "");
+  EXPECT_DEATH_IF_SUPPORTED({ DefaultValue<MyNonDefaultConstructible>::Get(); },
+                            "");
 }
 
 // Tests that ActionInterface can be implemented by defining the
@@ -1477,54 +1477,6 @@ TEST(DoAll, SupportsTypeErasedActions) {
   }
 }
 
-// A DoAll action should be convertible to a OnceAction, even when its component
-// sub-actions are user-provided types that define only an Action conversion
-// operator. If they supposed being called more than once then they also support
-// being called at most once.
-TEST(DoAll, ConvertibleToOnceActionWithUserProvidedActionConversion) {
-  // Simplest case: only one sub-action.
-  struct CustomFinal final {
-    operator Action<int()>() {  // NOLINT
-      return Return(17);
-    }
-
-    operator Action<int(int, char)>() {  // NOLINT
-      return Return(19);
-    }
-  };
-
-  {
-    OnceAction<int()> action = DoAll(CustomFinal{});
-    EXPECT_EQ(17, std::move(action).Call());
-  }
-
-  {
-    OnceAction<int(int, char)> action = DoAll(CustomFinal{});
-    EXPECT_EQ(19, std::move(action).Call(0, 0));
-  }
-
-  // It should also work with multiple sub-actions.
-  struct CustomInitial final {
-    operator Action<void()>() {  // NOLINT
-      return [] {};
-    }
-
-    operator Action<void(int, char)>() {  // NOLINT
-      return [] {};
-    }
-  };
-
-  {
-    OnceAction<int()> action = DoAll(CustomInitial{}, CustomFinal{});
-    EXPECT_EQ(17, std::move(action).Call());
-  }
-
-  {
-    OnceAction<int(int, char)> action = DoAll(CustomInitial{}, CustomFinal{});
-    EXPECT_EQ(19, std::move(action).Call(0, 0));
-  }
-}
-
 // Tests using WithArgs and with an action that takes 1 argument.
 TEST(WithArgsTest, OneArg) {
   Action<bool(double x, int n)> a = WithArgs<1>(Invoke(Unary));  // NOLINT

googlemock/test/gmock-matchers-arithmetic_test.cc

@@ -36,9 +36,7 @@
 #include <memory>
 #include <string>
 
-#include "gmock/gmock.h"
 #include "test/gmock-matchers_test.h"
-#include "gtest/gtest.h"
 
 // Silence warning C4244: 'initializing': conversion from 'int' to 'short',
 // possible loss of data and C4100, unreferenced local parameter

googlemock/test/gmock-matchers-comparisons_test.cc

@@ -37,14 +37,13 @@
 #include <tuple>
 #include <vector>
 
-#include "gmock/gmock.h"
 #include "test/gmock-matchers_test.h"
-#include "gtest/gtest.h"
 
 // Silence warning C4244: 'initializing': conversion from 'int' to 'short',
 // possible loss of data and C4100, unreferenced local parameter
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100)
 
+
 namespace testing {
 namespace gmock_matchers_test {
 namespace {

googlemock/test/gmock-matchers-containers_test.cc

@@ -43,14 +43,14 @@
 #include <tuple>
 #include <vector>
 
-#include "gmock/gmock.h"
-#include "test/gmock-matchers_test.h"
 #include "gtest/gtest.h"
 
 // Silence warning C4244: 'initializing': conversion from 'int' to 'short',
 // possible loss of data and C4100, unreferenced local parameter
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100)
 
+#include "test/gmock-matchers_test.h"
+
 namespace testing {
 namespace gmock_matchers_test {
 namespace {

googlemock/test/gmock-matchers-misc_test.cc

@@ -39,14 +39,14 @@
 #include <utility>
 #include <vector>
 
-#include "gmock/gmock.h"
-#include "test/gmock-matchers_test.h"
 #include "gtest/gtest.h"
 
 // Silence warning C4244: 'initializing': conversion from 'int' to 'short',
 // possible loss of data and C4100, unreferenced local parameter
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100)
 
+#include "test/gmock-matchers_test.h"
+
 namespace testing {
 namespace gmock_matchers_test {
 namespace {

googlemock/test/gmock_link_test.h

@@ -186,8 +186,8 @@ using testing::SetErrnoAndReturn;
 #endif
 
 #if GTEST_HAS_EXCEPTIONS
-using testing::Rethrow;
 using testing::Throw;
+using testing::Rethrow;
 #endif
 
 using testing::ContainsRegex;

googletest/README.md

@@ -25,7 +25,7 @@ When building GoogleTest as a standalone project, the typical workflow starts
 with
 
 ```
-git clone https://github.com/google/googletest.git -b v1.15.2
+git clone https://github.com/google/googletest.git -b v1.14.0
 cd googletest        # Main directory of the cloned repository.
 mkdir build          # Create a directory to hold the build output.
 cd build

googletest_deps.bzl

@@ -6,17 +6,17 @@ load("//:fake_fuchsia_sdk.bzl", "fake_fuchsia_sdk")
 def googletest_deps():
     """Loads common dependencies needed to use the googletest library."""
 
-    if not native.existing_rule("re2"):
+    if not native.existing_rule("com_googlesource_code_re2"):
         http_archive(
-            name = "re2",
+            name = "com_googlesource_code_re2",
             sha256 = "eb2df807c781601c14a260a507a5bb4509be1ee626024cb45acbd57cb9d4032b",
             strip_prefix = "re2-2024-07-02",
             urls = ["https://github.com/google/re2/releases/download/2024-07-02/re2-2024-07-02.tar.gz"],
         )
 
-    if not native.existing_rule("abseil-cpp"):
+    if not native.existing_rule("com_google_absl"):
         http_archive(
-            name = "abseil-cpp",
+            name = "com_google_absl",
             sha256 = "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc",
             strip_prefix = "abseil-cpp-20240116.2",
             urls = ["https://github.com/abseil/abseil-cpp/releases/download/20240116.2/abseil-cpp-20240116.2.tar.gz"],