Skip to content

Update to gRPC 1.69.0 #14342

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 7 commits into from
Feb 3, 2025
Merged

Update to gRPC 1.69.0 #14342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19614dc
Update to gRPC 1.66.0
ehsannas Jan 13, 2025
8bb628e
Upgrade to latest (1.69).
ehsannas Jan 21, 2025
5f36714
upgrade abseil version.
ehsannas Jan 21, 2025
8fd5b5c
upgrade abseil_version used in .podspec
ehsannas Jan 21, 2025
a4ef9dd
Remove the abseil pod from the Firestore/Example/Podfile.
ehsannas Jan 23, 2025
2bc51d5
re-add abseil pod with matching version to avoid ProtobufCpp conflict.
ehsannas Jan 23, 2025
a2c28b6
Update the abseil version in ProtobufCpp.podspec.
ehsannas Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions FirebaseFirestoreInternal.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
s.dependency 'FirebaseAppCheckInterop', '~> 11.0'
s.dependency 'FirebaseCore', '~> 11.7.0'

abseil_version = '~> 1.20240116.1'
abseil_version = '~> 1.20240722.0'
s.dependency 'abseil/algorithm', abseil_version
s.dependency 'abseil/base', abseil_version
s.dependency 'abseil/container/flat_hash_map', abseil_version
Expand All @@ -105,8 +105,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
s.dependency 'abseil/time', abseil_version
s.dependency 'abseil/types', abseil_version

s.dependency 'gRPC-Core', '~> 1.65.0'
s.dependency 'gRPC-C++', '~> 1.65.0'
s.dependency 'gRPC-Core', '~> 1.69.0'
s.dependency 'gRPC-C++', '~> 1.69.0'
s.dependency 'leveldb-library', '~> 1.22'
s.dependency 'nanopb', '~> 3.30910.0'

Expand Down
1 change: 1 addition & 0 deletions Firestore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Unreleased
- [fixed] Fixed use-after-free bug when internally formatting strings. (#14306)
- [changed] Update gRPC dependency to 1.69.

# 11.6.0
- [fixed] Add conditional `Sendable` conformance so `ServerTimestamp<T>` is
Expand Down
6 changes: 3 additions & 3 deletions Firestore/Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if is_platform(:ios)

configure_local_pods()

pod 'abseil', '~> 1.20240116.1'
pod 'abseil', '~> 1.20240722.0'

target 'Firestore_Tests_iOS' do
inherit! :search_paths
Expand Down Expand Up @@ -142,7 +142,7 @@ if is_platform(:osx)

configure_local_pods()

pod 'abseil', '~> 1.20240116.1'
pod 'abseil', '~> 1.20240722.0'

target 'Firestore_Tests_macOS' do
inherit! :search_paths
Expand Down Expand Up @@ -172,7 +172,7 @@ if is_platform(:tvos)

configure_local_pods()

pod 'abseil', '~> 1.20240116.1'
pod 'abseil', '~> 1.20240722.0'

target 'Firestore_Tests_tvOS' do
inherit! :search_paths
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/ProtobufCpp.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Pod::Spec.new do |s|

s.header_mappings_dir = 'src/'

s.dependency 'abseil', '~> 1.20240116.1'
s.dependency 'abseil', '~> 1.20240722.0'

# Set a CPP symbol so the code knows to use framework imports.
s.pod_target_xcconfig = {
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ func abseilDependency() -> Package.Dependency {
if ProcessInfo.processInfo.environment["FIREBASE_SOURCE_FIRESTORE"] != nil {
packageInfo = (
"https://github.com/firebase/abseil-cpp-SwiftPM.git",
"0.20240116.1" ..< "0.20240117.0"
"0.20240722.0" ..< "0.20240723.0"
)
} else {
packageInfo = (
Expand All @@ -1365,7 +1365,7 @@ func grpcDependency() -> Package.Dependency {
// If building Firestore from source, abseil will need to be built as source
// as the headers in the binary version of abseil are unusable.
if ProcessInfo.processInfo.environment["FIREBASE_SOURCE_FIRESTORE"] != nil {
packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.65.0" ..< "1.66.0")
packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.69.0" ..< "1.70.0")
} else {
packageInfo = ("https://github.com/google/grpc-binary.git", "1.65.1" ..< "1.66.0")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be updated in a follow-up PR. Please coordinate with @ncooke3 to do so.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SG

}
Expand Down
Loading