Skip to content

Commit b7dc921

Browse files
authored
Upgrade grpc to 1.44 for SPM and Cocoapods (#9532)
1 parent 445ad78 commit b7dc921

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/workflows/firestore.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,12 @@ jobs:
199199
run: ./scripts/setup_bundler.sh
200200

201201
- name: Pod lib lint
202+
# TODO(#9565, b/227461966): Remove --no-analyze when absl is fixed.
202203
run: |
203204
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} \
204205
--platforms=ios \
205-
--allow-warnings
206+
--allow-warnings \
207+
--no-analyze
206208
207209
# `pod lib lint` takes a long time so only run the other platforms and static frameworks build in the cron.
208210
pod-lib-lint-cron:
@@ -231,11 +233,13 @@ jobs:
231233
run: ./scripts/setup_bundler.sh
232234

233235
- name: Pod lib lint
236+
# TODO(#9565, b/227461966): Remove --no-analyze when absl is fixed.
234237
run: |
235238
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }}\
236239
${{ matrix.flags }} \
237240
--platforms=${{ matrix.platforms }} \
238-
--allow-warnings
241+
--allow-warnings \
242+
--no-analyze
239243
240244
spm:
241245
# Don't run on private repo unless it is a PR.

FirebaseFirestore.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
8888

8989
s.dependency 'FirebaseCore', '~> 8.0'
9090

91-
abseil_version = '0.20200225.0'
91+
abseil_version = '~> 1.20211102.0'
9292
s.dependency 'abseil/algorithm', abseil_version
9393
s.dependency 'abseil/base', abseil_version
9494
s.dependency 'abseil/container/flat_hash_map', abseil_version
@@ -98,7 +98,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
9898
s.dependency 'abseil/time', abseil_version
9999
s.dependency 'abseil/types', abseil_version
100100

101-
s.dependency 'gRPC-C++', '~> 1.28.0'
101+
s.dependency 'gRPC-C++', '~> 1.44.0'
102102
s.dependency 'leveldb-library', '~> 1.22'
103103
s.dependency 'nanopb', '~> 2.30908.0'
104104

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@ let package = Package(
178178
.package(
179179
name: "abseil",
180180
url: "https://github.com/firebase/abseil-cpp-SwiftPM.git",
181-
"0.20200225.4" ..< "0.20200226.0"
181+
"0.20220203.1" ..< "0.20220204.0"
182182
),
183183
.package(
184184
name: "gRPC",
185-
url: "https://github.com/firebase/grpc-SwiftPM.git",
186-
"1.28.4" ..< "1.29.0"
185+
url: "https://github.com/grpc/grpc-ios.git",
186+
"1.44.0-grpc" ..< "1.45.0-grpc"
187187
),
188188
.package(
189189
name: "OCMock",

0 commit comments

Comments
 (0)