Переглянути джерело

Upgrade grpc to 1.44 for SPM and Cocoapods (#9532)

wu-hui 4 роки тому
батько
коміт
b7dc921068
3 змінених файлів з 11 додано та 7 видалено
  1. 6 2
      .github/workflows/firestore.yml
  2. 2 2
      FirebaseFirestore.podspec
  3. 3 3
      Package.swift

+ 6 - 2
.github/workflows/firestore.yml

@@ -199,10 +199,12 @@ jobs:
       run: ./scripts/setup_bundler.sh
 
     - name: Pod lib lint
+      # TODO(#9565, b/227461966): Remove --no-analyze when absl is fixed.
       run: |
         scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} \
             --platforms=ios \
-            --allow-warnings
+            --allow-warnings \
+            --no-analyze
 
   # `pod lib lint` takes a long time so only run the other platforms and static frameworks build in the cron.
   pod-lib-lint-cron:
@@ -231,11 +233,13 @@ jobs:
       run: ./scripts/setup_bundler.sh
 
     - name: Pod lib lint
+      # TODO(#9565, b/227461966): Remove --no-analyze when absl is fixed.
       run: |
         scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }}\
             ${{ matrix.flags }} \
             --platforms=${{ matrix.platforms }} \
-            --allow-warnings
+            --allow-warnings \
+            --no-analyze
 
   spm:
     # Don't run on private repo unless it is a PR.

+ 2 - 2
FirebaseFirestore.podspec

@@ -88,7 +88,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
 
   s.dependency 'FirebaseCore', '~> 8.0'
 
-  abseil_version = '0.20200225.0'
+  abseil_version = '~> 1.20211102.0'
   s.dependency 'abseil/algorithm', abseil_version
   s.dependency 'abseil/base', abseil_version
   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,
   s.dependency 'abseil/time', abseil_version
   s.dependency 'abseil/types', abseil_version
 
-  s.dependency 'gRPC-C++', '~> 1.28.0'
+  s.dependency 'gRPC-C++', '~> 1.44.0'
   s.dependency 'leveldb-library', '~> 1.22'
   s.dependency 'nanopb', '~> 2.30908.0'
 

+ 3 - 3
Package.swift

@@ -178,12 +178,12 @@ let package = Package(
     .package(
       name: "abseil",
       url: "https://github.com/firebase/abseil-cpp-SwiftPM.git",
-      "0.20200225.4" ..< "0.20200226.0"
+      "0.20220203.1" ..< "0.20220204.0"
     ),
     .package(
       name: "gRPC",
-      url: "https://github.com/firebase/grpc-SwiftPM.git",
-      "1.28.4" ..< "1.29.0"
+      url: "https://github.com/grpc/grpc-ios.git",
+      "1.44.0-grpc" ..< "1.45.0-grpc"
     ),
     .package(
       name: "OCMock",