Skip to content

Commit

Permalink
Move Abseil to GoogleTest 1.16.0
Browse files Browse the repository at this point in the history
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
  • Loading branch information
derekmauro authored and copybara-github committed Feb 8, 2025
1 parent a144212 commit 860dcf1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ bazel_dep(
# intended to be used by Abseil users depend on GoogleTest.
bazel_dep(
name = "googletest",
version = "1.15.2",
version = "1.16.0",
)
12 changes: 3 additions & 9 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# GoogleTest/GoogleMock framework. Used by most unit-tests.
http_archive(
name = "googletest",
sha256 = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926",
strip_prefix = "googletest-1.15.2",
sha256 = "78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399",
strip_prefix = "googletest-1.16.0",
# Keep this URL in sync with the version in ci/cmake_common.sh and
# ci/windows_msvc_cmake.bat.
urls = ["https://github.com/google/googletest/releases/download/v1.15.2/googletest-1.15.2.tar.gz"],
# Now that Abseil is using the canonical names from the Bazel Central Registry, map
# GoogleTest's old names to the new canonical names.
repo_mapping = {
"@com_google_absl": "@",
"@com_googlesource_code_re2": "@re2",
},
urls = ["https://github.com/google/googletest/releases/download/v1.16.0/googletest-1.16.0.tar.gz"],
)

# RE2 (the regular expression library used by GoogleTest)
Expand Down
2 changes: 1 addition & 1 deletion ci/cmake_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

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

readonly ABSL_GOOGLETEST_DOWNLOAD_URL="https://github.com/google/googletest/releases/download/v${ABSL_GOOGLETEST_VERSION}/googletest-${ABSL_GOOGLETEST_VERSION}.tar.gz"
2 changes: 1 addition & 1 deletion ci/windows_msvc_cmake.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION

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

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

0 comments on commit 860dcf1

Please sign in to comment.