Skip to content

Commit 06be363

Browse files
morganchen12morganchen12
committed
fix iOS build
1 parent 6b284d3 commit 06be363

File tree

4 files changed

+239
-81
lines changed

4 files changed

+239
-81
lines changed

‎firestore/android/FirestoreSnippetsCpp/app/src/main/cpp/snippets.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/*
2929
* A collection of code snippets for the Firestore C++ SDK. These snippets
30-
* were modelled after the existing Firestore guide, which can be found
30+
* were modeled after the existing Firestore guide, which can be found
3131
* here: https://firebase.google.com/docs/firestore.
3232
*
3333
* Note that not all of the Firestore API has been implemented yet, so some

‎firestore/ios/Podfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
platform :ios, '9.0'
1+
platform :ios, '11.0'
22

33
target 'firestore-snippets-cpp' do
44
use_frameworks!
55

6-
pod 'Firebase/Auth', '6.26.0'
7-
pod 'Firebase/Firestore', '6.26.0'
6+
pod 'Firebase/Auth', '8.7.0'
7+
pod 'Firebase/Firestore', '8.7.0'
88

99
end

‎firestore/ios/Podfile.lock

+184-68
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,45 @@ PODS:
8383
- abseil/base/throw_delegate (0.20200225.0):
8484
- abseil/base/config
8585
- abseil/base/raw_logging_internal
86+
- abseil/container/common (0.20200225.0):
87+
- abseil/meta/type_traits
88+
- abseil/types/optional
8689
- abseil/container/compressed_tuple (0.20200225.0):
8790
- abseil/utility/utility
91+
- abseil/container/container_memory (0.20200225.0):
92+
- abseil/memory/memory
93+
- abseil/utility/utility
94+
- abseil/container/fixed_array (0.20200225.0):
95+
- abseil/algorithm/algorithm
96+
- abseil/base/core_headers
97+
- abseil/base/dynamic_annotations
98+
- abseil/base/throw_delegate
99+
- abseil/container/compressed_tuple
100+
- abseil/memory/memory
101+
- abseil/container/flat_hash_map (0.20200225.0):
102+
- abseil/algorithm/container
103+
- abseil/container/container_memory
104+
- abseil/container/hash_function_defaults
105+
- abseil/container/raw_hash_map
106+
- abseil/memory/memory
107+
- abseil/container/hash_function_defaults (0.20200225.0):
108+
- abseil/base/config
109+
- abseil/hash/hash
110+
- abseil/strings/strings
111+
- abseil/container/hash_policy_traits (0.20200225.0):
112+
- abseil/meta/type_traits
113+
- abseil/container/hashtable_debug_hooks (0.20200225.0):
114+
- abseil/base/config
115+
- abseil/container/hashtablez_sampler (0.20200225.0):
116+
- abseil/base/base
117+
- abseil/base/core_headers
118+
- abseil/base/exponential_biased
119+
- abseil/container/have_sse
120+
- abseil/debugging/stacktrace
121+
- abseil/memory/memory
122+
- abseil/synchronization/synchronization
123+
- abseil/utility/utility
124+
- abseil/container/have_sse (0.20200225.0)
88125
- abseil/container/inlined_vector (0.20200225.0):
89126
- abseil/algorithm/algorithm
90127
- abseil/base/core_headers
@@ -97,6 +134,70 @@ PODS:
97134
- abseil/memory/memory
98135
- abseil/meta/type_traits
99136
- abseil/types/span
137+
- abseil/container/layout (0.20200225.0):
138+
- abseil/base/core_headers
139+
- abseil/meta/type_traits
140+
- abseil/strings/strings
141+
- abseil/types/span
142+
- abseil/utility/utility
143+
- abseil/container/raw_hash_map (0.20200225.0):
144+
- abseil/base/throw_delegate
145+
- abseil/container/container_memory
146+
- abseil/container/raw_hash_set
147+
- abseil/container/raw_hash_set (0.20200225.0):
148+
- abseil/base/bits
149+
- abseil/base/config
150+
- abseil/base/core_headers
151+
- abseil/base/endian
152+
- abseil/container/common
153+
- abseil/container/compressed_tuple
154+
- abseil/container/container_memory
155+
- abseil/container/hash_policy_traits
156+
- abseil/container/hashtable_debug_hooks
157+
- abseil/container/hashtablez_sampler
158+
- abseil/container/have_sse
159+
- abseil/container/layout
160+
- abseil/memory/memory
161+
- abseil/meta/type_traits
162+
- abseil/utility/utility
163+
- abseil/debugging/debugging_internal (0.20200225.0):
164+
- abseil/base/config
165+
- abseil/base/core_headers
166+
- abseil/base/dynamic_annotations
167+
- abseil/base/errno_saver
168+
- abseil/base/raw_logging_internal
169+
- abseil/debugging/demangle_internal (0.20200225.0):
170+
- abseil/base/base
171+
- abseil/base/config
172+
- abseil/base/core_headers
173+
- abseil/debugging/stacktrace (0.20200225.0):
174+
- abseil/base/config
175+
- abseil/base/core_headers
176+
- abseil/debugging/debugging_internal
177+
- abseil/debugging/symbolize (0.20200225.0):
178+
- abseil/base/base
179+
- abseil/base/config
180+
- abseil/base/core_headers
181+
- abseil/base/dynamic_annotations
182+
- abseil/base/malloc_internal
183+
- abseil/base/raw_logging_internal
184+
- abseil/debugging/debugging_internal
185+
- abseil/debugging/demangle_internal
186+
- abseil/hash/city (0.20200225.0):
187+
- abseil/base/config
188+
- abseil/base/core_headers
189+
- abseil/base/endian
190+
- abseil/hash/hash (0.20200225.0):
191+
- abseil/base/core_headers
192+
- abseil/base/endian
193+
- abseil/container/fixed_array
194+
- abseil/hash/city
195+
- abseil/meta/type_traits
196+
- abseil/numeric/int128
197+
- abseil/strings/strings
198+
- abseil/types/optional
199+
- abseil/types/variant
200+
- abseil/utility/utility
100201
- abseil/memory (0.20200225.0):
101202
- abseil/memory/memory (= 0.20200225.0)
102203
- abseil/memory/memory (0.20200225.0):
@@ -136,6 +237,31 @@ PODS:
136237
- abseil/meta/type_traits
137238
- abseil/numeric/int128
138239
- abseil/strings/internal
240+
- abseil/synchronization/graphcycles_internal (0.20200225.0):
241+
- abseil/base/base
242+
- abseil/base/base_internal
243+
- abseil/base/config
244+
- abseil/base/core_headers
245+
- abseil/base/malloc_internal
246+
- abseil/base/raw_logging_internal
247+
- abseil/synchronization/kernel_timeout_internal (0.20200225.0):
248+
- abseil/base/core_headers
249+
- abseil/base/raw_logging_internal
250+
- abseil/time/time
251+
- abseil/synchronization/synchronization (0.20200225.0):
252+
- abseil/base/atomic_hook
253+
- abseil/base/base
254+
- abseil/base/base_internal
255+
- abseil/base/config
256+
- abseil/base/core_headers
257+
- abseil/base/dynamic_annotations
258+
- abseil/base/malloc_internal
259+
- abseil/base/raw_logging_internal
260+
- abseil/debugging/stacktrace
261+
- abseil/debugging/symbolize
262+
- abseil/synchronization/graphcycles_internal
263+
- abseil/synchronization/kernel_timeout_internal
264+
- abseil/time/time
139265
- abseil/time (0.20200225.0):
140266
- abseil/time/internal (= 0.20200225.0)
141267
- abseil/time/time (= 0.20200225.0)
@@ -218,63 +344,59 @@ PODS:
218344
- BoringSSL-GRPC/Implementation (0.0.7):
219345
- BoringSSL-GRPC/Interface (= 0.0.7)
220346
- BoringSSL-GRPC/Interface (0.0.7)
221-
- Firebase/Auth (6.26.0):
347+
- Firebase/Auth (8.7.0):
222348
- Firebase/CoreOnly
223-
- FirebaseAuth (~> 6.5.3)
224-
- Firebase/CoreOnly (6.26.0):
225-
- FirebaseCore (= 6.7.2)
226-
- Firebase/Firestore (6.26.0):
349+
- FirebaseAuth (~> 8.7.0)
350+
- Firebase/CoreOnly (8.7.0):
351+
- FirebaseCore (= 8.7.0)
352+
- Firebase/Firestore (8.7.0):
227353
- Firebase/CoreOnly
228-
- FirebaseFirestore (~> 1.15.0)
229-
- FirebaseAuth (6.5.3):
230-
- FirebaseAuthInterop (~> 1.0)
231-
- FirebaseCore (~> 6.6)
232-
- GoogleUtilities/AppDelegateSwizzler (~> 6.5)
233-
- GoogleUtilities/Environment (~> 6.5)
234-
- GTMSessionFetcher/Core (~> 1.1)
235-
- FirebaseAuthInterop (1.1.0)
236-
- FirebaseCore (6.7.2):
237-
- FirebaseCoreDiagnostics (~> 1.3)
238-
- FirebaseCoreDiagnosticsInterop (~> 1.2)
239-
- GoogleUtilities/Environment (~> 6.5)
240-
- GoogleUtilities/Logger (~> 6.5)
241-
- FirebaseCoreDiagnostics (1.4.0):
242-
- GoogleDataTransportCCTSupport (~> 3.1)
243-
- GoogleUtilities/Environment (~> 6.5)
244-
- GoogleUtilities/Logger (~> 6.5)
245-
- nanopb (~> 1.30905.0)
246-
- FirebaseCoreDiagnosticsInterop (1.2.0)
247-
- FirebaseFirestore (1.15.0):
354+
- FirebaseFirestore (~> 8.7.0)
355+
- FirebaseAuth (8.7.0):
356+
- FirebaseCore (~> 8.0)
357+
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
358+
- GoogleUtilities/Environment (~> 7.4)
359+
- GTMSessionFetcher/Core (~> 1.5)
360+
- FirebaseCore (8.7.0):
361+
- FirebaseCoreDiagnostics (~> 8.0)
362+
- GoogleUtilities/Environment (~> 7.4)
363+
- GoogleUtilities/Logger (~> 7.4)
364+
- FirebaseCoreDiagnostics (8.8.0):
365+
- GoogleDataTransport (~> 9.0)
366+
- GoogleUtilities/Environment (~> 7.4)
367+
- GoogleUtilities/Logger (~> 7.4)
368+
- nanopb (~> 2.30908.0)
369+
- FirebaseFirestore (8.7.0):
248370
- abseil/algorithm (= 0.20200225.0)
249371
- abseil/base (= 0.20200225.0)
372+
- abseil/container/flat_hash_map (= 0.20200225.0)
250373
- abseil/memory (= 0.20200225.0)
251374
- abseil/meta (= 0.20200225.0)
252375
- abseil/strings/strings (= 0.20200225.0)
253376
- abseil/time (= 0.20200225.0)
254377
- abseil/types (= 0.20200225.0)
255-
- FirebaseAuthInterop (~> 1.0)
256-
- FirebaseCore (~> 6.2)
378+
- FirebaseCore (~> 8.0)
257379
- "gRPC-C++ (~> 1.28.0)"
258380
- leveldb-library (~> 1.22)
259-
- nanopb (~> 1.30905.0)
260-
- GoogleDataTransport (6.2.1)
261-
- GoogleDataTransportCCTSupport (3.2.0):
262-
- GoogleDataTransport (~> 6.1)
263-
- nanopb (~> 1.30905.0)
264-
- GoogleUtilities/AppDelegateSwizzler (6.6.0):
381+
- nanopb (~> 2.30908.0)
382+
- GoogleDataTransport (9.1.0):
383+
- GoogleUtilities/Environment (~> 7.2)
384+
- nanopb (~> 2.30908.0)
385+
- PromisesObjC (< 3.0, >= 1.2)
386+
- GoogleUtilities/AppDelegateSwizzler (7.5.2):
265387
- GoogleUtilities/Environment
266388
- GoogleUtilities/Logger
267389
- GoogleUtilities/Network
268-
- GoogleUtilities/Environment (6.6.0):
269-
- PromisesObjC (~> 1.2)
270-
- GoogleUtilities/Logger (6.6.0):
390+
- GoogleUtilities/Environment (7.5.2):
391+
- PromisesObjC (< 3.0, >= 1.2)
392+
- GoogleUtilities/Logger (7.5.2):
271393
- GoogleUtilities/Environment
272-
- GoogleUtilities/Network (6.6.0):
394+
- GoogleUtilities/Network (7.5.2):
273395
- GoogleUtilities/Logger
274396
- "GoogleUtilities/NSData+zlib"
275397
- GoogleUtilities/Reachability
276-
- "GoogleUtilities/NSData+zlib (6.6.0)"
277-
- GoogleUtilities/Reachability (6.6.0):
398+
- "GoogleUtilities/NSData+zlib (7.5.2)"
399+
- GoogleUtilities/Reachability (7.5.2):
278400
- GoogleUtilities/Logger
279401
- "gRPC-C++ (1.28.2)":
280402
- "gRPC-C++/Implementation (= 1.28.2)"
@@ -300,32 +422,29 @@ PODS:
300422
- BoringSSL-GRPC (= 0.0.7)
301423
- gRPC-Core/Interface (= 1.28.2)
302424
- gRPC-Core/Interface (1.28.2)
303-
- GTMSessionFetcher/Core (1.4.0)
304-
- leveldb-library (1.22)
305-
- nanopb (1.30905.0):
306-
- nanopb/decode (= 1.30905.0)
307-
- nanopb/encode (= 1.30905.0)
308-
- nanopb/decode (1.30905.0)
309-
- nanopb/encode (1.30905.0)
310-
- PromisesObjC (1.2.9)
425+
- GTMSessionFetcher/Core (1.7.0)
426+
- leveldb-library (1.22.1)
427+
- nanopb (2.30908.0):
428+
- nanopb/decode (= 2.30908.0)
429+
- nanopb/encode (= 2.30908.0)
430+
- nanopb/decode (2.30908.0)
431+
- nanopb/encode (2.30908.0)
432+
- PromisesObjC (2.0.0)
311433

312434
DEPENDENCIES:
313-
- Firebase/Auth (= 6.26.0)
314-
- Firebase/Firestore (= 6.26.0)
435+
- Firebase/Auth (= 8.7.0)
436+
- Firebase/Firestore (= 8.7.0)
315437

316438
SPEC REPOS:
317439
trunk:
318440
- abseil
319441
- BoringSSL-GRPC
320442
- Firebase
321443
- FirebaseAuth
322-
- FirebaseAuthInterop
323444
- FirebaseCore
324445
- FirebaseCoreDiagnostics
325-
- FirebaseCoreDiagnosticsInterop
326446
- FirebaseFirestore
327447
- GoogleDataTransport
328-
- GoogleDataTransportCCTSupport
329448
- GoogleUtilities
330449
- "gRPC-C++"
331450
- gRPC-Core
@@ -337,23 +456,20 @@ SPEC REPOS:
337456
SPEC CHECKSUMS:
338457
abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
339458
BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
340-
Firebase: 7cf5f9c67f03cb3b606d1d6535286e1080e57eb6
341-
FirebaseAuth: 7047aec89c0b17ecd924a550c853f0c27ac6015e
342-
FirebaseAuthInterop: a0f37ae05833af156e72028f648d313f7e7592e9
343-
FirebaseCore: f42e5e5f382cdcf6b617ed737bf6c871a6947b17
344-
FirebaseCoreDiagnostics: 4505e4d4009b1d93f605088ee7d7764d5f0d1c84
345-
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
346-
FirebaseFirestore: 8c158bdde010fa397386333a74570eaef033e62d
347-
GoogleDataTransport: 9a8a16f79feffc7f42096743de2a7c4815e84020
348-
GoogleDataTransportCCTSupport: 489c1265d2c85b68187a83a911913d190012158d
349-
GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
459+
Firebase: bc9325d5ee2041524bac78a5213d0e530c651309
460+
FirebaseAuth: 2e7d029977648c67a5d51a263d4cbab76d34cf12
461+
FirebaseCore: f4804c1d3f4bbbefc88904d15653038f2c99ddf7
462+
FirebaseCoreDiagnostics: fe77f42da6329d6d83d21fd9d621a6b704413bfc
463+
FirebaseFirestore: e722ba956610c45d368d9787689e2aa41b809e68
464+
GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9
465+
GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040
350466
"gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
351467
gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
352-
GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
353-
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
354-
nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
355-
PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
468+
GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
469+
leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729
470+
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
471+
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
356472

357-
PODFILE CHECKSUM: 065e7c72e9add7020e0b596dbe85a95fd41e23b9
473+
PODFILE CHECKSUM: 41de052785f3eea40b751c12493e8c465a724046
358474

359-
COCOAPODS: 1.9.3
475+
COCOAPODS: 1.10.1

0 commit comments

Comments
 (0)