Skip to content

Commit 860dcf1

Browse files
derekmaurocopybara-github
authored andcommitted
Move Abseil to GoogleTest 1.16.0
This allows us to get rid of the repo_mapping since 1.16.0 is now using canonical names. PiperOrigin-RevId: 724543391 Change-Id: I9e0b6e4ecadaa4de6c5140820b444d5af927ab6c
1 parent a144212 commit 860dcf1

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ bazel_dep(
4242
# intended to be used by Abseil users depend on GoogleTest.
4343
bazel_dep(
4444
name = "googletest",
45-
version = "1.15.2",
45+
version = "1.16.0",
4646
)

WORKSPACE

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2121
# GoogleTest/GoogleMock framework. Used by most unit-tests.
2222
http_archive(
2323
name = "googletest",
24-
sha256 = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926",
25-
strip_prefix = "googletest-1.15.2",
24+
sha256 = "78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399",
25+
strip_prefix = "googletest-1.16.0",
2626
# Keep this URL in sync with the version in ci/cmake_common.sh and
2727
# ci/windows_msvc_cmake.bat.
28-
urls = ["https://github.com/google/googletest/releases/download/v1.15.2/googletest-1.15.2.tar.gz"],
29-
# Now that Abseil is using the canonical names from the Bazel Central Registry, map
30-
# GoogleTest's old names to the new canonical names.
31-
repo_mapping = {
32-
"@com_google_absl": "@",
33-
"@com_googlesource_code_re2": "@re2",
34-
},
28+
urls = ["https://github.com/google/googletest/releases/download/v1.16.0/googletest-1.16.0.tar.gz"],
3529
)
3630

3731
# RE2 (the regular expression library used by GoogleTest)

ci/cmake_common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414

1515
# The commit of GoogleTest to be used in the CMake tests in this directory.
1616
# Keep this in sync with the commit in the WORKSPACE file.
17-
readonly ABSL_GOOGLETEST_VERSION="1.15.2"
17+
readonly ABSL_GOOGLETEST_VERSION="1.16.0"
1818

1919
readonly ABSL_GOOGLETEST_DOWNLOAD_URL="https://github.com/google/googletest/releases/download/v${ABSL_GOOGLETEST_VERSION}/googletest-${ABSL_GOOGLETEST_VERSION}.tar.gz"

ci/windows_msvc_cmake.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION
1616

1717
:: The version of GoogleTest to be used in the CMake tests in this directory.
1818
:: Keep this in sync with the version in the WORKSPACE file.
19-
SET ABSL_GOOGLETEST_VERSION=1.15.2
19+
SET ABSL_GOOGLETEST_VERSION=1.16.0
2020
SET ABSL_GOOGLETEST_DOWNLOAD_URL=https://github.com/google/googletest/releases/download/v%ABSL_GOOGLETEST_VERSION%/googletest-%ABSL_GOOGLETEST_VERSION%.tar.gz
2121

2222
:: Replace '\' with '/' in Windows paths for CMake.

0 commit comments

Comments
 (0)