Merge pull request #25198 from veblush/absl-upgrade

Upgrade Abseil to 20200923.3
pull/25221/head^2
Esun Kim 4 years ago committed by GitHub
commit f4fa4a18bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      bazel/grpc_deps.bzl
  2. 2
      gRPC-C++.podspec
  3. 2
      gRPC-Core.podspec
  4. 2
      templates/gRPC-C++.podspec.template
  5. 2
      templates/gRPC-Core.podspec.template
  6. 2
      third_party/abseil-cpp
  7. 2
      tools/run_tests/sanity/check_submodules.sh

@ -245,11 +245,11 @@ def grpc_deps():
if "com_google_absl" not in native.existing_rules(): if "com_google_absl" not in native.existing_rules():
http_archive( http_archive(
name = "com_google_absl", name = "com_google_absl",
sha256 = "3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef", sha256 = "62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93",
strip_prefix = "abseil-cpp-0f3bb466b868b523cf1dc9b2aaaed65c77b28862", strip_prefix = "abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c",
urls = [ urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/0f3bb466b868b523cf1dc9b2aaaed65c77b28862.tar.gz", "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/0f3bb466b868b523cf1dc9b2aaaed65c77b28862.tar.gz", "https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz",
], ],
) )

@ -185,7 +185,7 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency 'gRPC-Core', version ss.dependency 'gRPC-Core', version
abseil_version = '1.20200923.2' abseil_version = '1.20200923.3'
ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/base', abseil_version
ss.dependency 'abseil/container/flat_hash_map', abseil_version ss.dependency 'abseil/container/flat_hash_map', abseil_version
ss.dependency 'abseil/container/flat_hash_set', abseil_version ss.dependency 'abseil/container/flat_hash_set', abseil_version

@ -46,7 +46,7 @@ Pod::Spec.new do |s|
s.requires_arc = false s.requires_arc = false
name = 'grpc' name = 'grpc'
abseil_version = '1.20200923.2' abseil_version = '1.20200923.3'
# When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
# This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include # This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include

@ -165,7 +165,7 @@
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency 'gRPC-Core', version ss.dependency 'gRPC-Core', version
abseil_version = '1.20200923.2' abseil_version = '1.20200923.3'
% for abseil_spec in grpcpp_abseil_specs: % for abseil_spec in grpcpp_abseil_specs:
ss.dependency '${abseil_spec}', abseil_version ss.dependency '${abseil_spec}', abseil_version
% endfor % endfor

@ -123,7 +123,7 @@
s.requires_arc = false s.requires_arc = false
name = 'grpc' name = 'grpc'
abseil_version = '1.20200923.2' abseil_version = '1.20200923.3'
# When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
# This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include # This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include

@ -1 +1 @@
Subproject commit 0f3bb466b868b523cf1dc9b2aaaed65c77b28862 Subproject commit 6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c

@ -26,7 +26,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)
git submodule | awk '{ print $1 }' | sort > "$submodules" git submodule | awk '{ print $1 }' | sort > "$submodules"
cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
0f3bb466b868b523cf1dc9b2aaaed65c77b28862 third_party/abseil-cpp (heads/master) 6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c third_party/abseil-cpp (heads/master)
090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0) 090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0)
73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd) 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
29c6e0e27268f5a43e039cd2ed4e849d6b736fc1 third_party/boringssl-with-bazel (remotes/origin/master-with-bazel) 29c6e0e27268f5a43e039cd2ed4e849d6b736fc1 third_party/boringssl-with-bazel (remotes/origin/master-with-bazel)

Loading…
Cancel
Save