From 17c20063ba17c0479e09e0b442d9749250183f98 Mon Sep 17 00:00:00 2001 From: Sibin Lu Date: Sat, 17 Oct 2020 10:17:29 -0700 Subject: [PATCH] resolve firebase conflicts --- Podfile | 9 +- Podfile.lock | 384 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 335 insertions(+), 58 deletions(-) diff --git a/Podfile b/Podfile index 04bedec..116ca5b 100644 --- a/Podfile +++ b/Podfile @@ -12,6 +12,7 @@ target 'TokenSdk' do pod 'Unirest', '~>1.1.4' # A workaround for issue https://github.com/firebase/firebase-ios-sdk/issues/2665 pod 'Protobuf', :inhibit_warnings => true + pod 'Firebase', '6.22' target 'TokenSdkTests' do inherit! :search_paths @@ -103,17 +104,17 @@ post_install do |installer| dir = "src/generated" system("rm -rf #{dir}"); - gencommand = + gencommand = generate_protos_cmd("common", dir) + generate_protos_cmd("common/provider", dir) + - generate_protos_cmd("common/google/api", dir) + + generate_protos_cmd("common/google/api", dir) + generate_protos_cmd("common/google/protobuf", dir) + generate_protos_cmd("external/gateway", dir) + generate_protos_cmd("fank", dir) + generate_protos_cmd("extensions", dir) ; - + system(gencommand) - + installer.pods_project.targets.each do |target| target.build_configurations.each do |config| config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' diff --git a/Podfile.lock b/Podfile.lock index 84139bd..bc53f61 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,11 +1,15 @@ PODS: - - "!ProtoCompiler (3.12.2)": + - "!ProtoCompiler (3.13.0)": - Protobuf (~> 3.0) - - "!ProtoCompiler-gRPCPlugin (1.30.0)": - - "!ProtoCompiler (= 3.12.2)" - - gRPC-ProtoRPC (= 1.30.0) + - "!ProtoCompiler-gRPCPlugin (1.32.0)": + - "!ProtoCompiler (= 3.13.0)" + - gRPC-ProtoRPC (= 1.32.0) - abseil/algorithm/algorithm (1.20200225.0): - abseil/base/config + - abseil/algorithm/container (1.20200225.0): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/meta/type_traits - abseil/base/atomic_hook (1.20200225.0): - abseil/base/config - abseil/base/core_headers @@ -34,9 +38,19 @@ PODS: - abseil/base/core_headers - abseil/base/errno_saver (1.20200225.0): - abseil/base/config + - abseil/base/exponential_biased (1.20200225.0): + - abseil/base/config + - abseil/base/core_headers - abseil/base/log_severity (1.20200225.0): - abseil/base/config - abseil/base/core_headers + - abseil/base/malloc_internal (1.20200225.0): + - abseil/base/base + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/raw_logging_internal - abseil/base/raw_logging_internal (1.20200225.0): - abseil/base/atomic_hook - abseil/base/config @@ -49,8 +63,46 @@ PODS: - abseil/base/throw_delegate (1.20200225.0): - abseil/base/config - abseil/base/raw_logging_internal + - abseil/container/common (1.20200225.0): + - abseil/meta/type_traits + - abseil/types/optional - abseil/container/compressed_tuple (1.20200225.0): - abseil/utility/utility + - abseil/container/container_memory (1.20200225.0): + - abseil/memory/memory + - abseil/utility/utility + - abseil/container/fixed_array (1.20200225.0): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/throw_delegate + - abseil/container/compressed_tuple + - abseil/memory/memory + - abseil/container/flat_hash_set (1.20200225.0): + - abseil/algorithm/container + - abseil/base/core_headers + - abseil/container/container_memory + - abseil/container/hash_function_defaults + - abseil/container/raw_hash_set + - abseil/memory/memory + - abseil/container/hash_function_defaults (1.20200225.0): + - abseil/base/config + - abseil/hash/hash + - abseil/strings/strings + - abseil/container/hash_policy_traits (1.20200225.0): + - abseil/meta/type_traits + - abseil/container/hashtable_debug_hooks (1.20200225.0): + - abseil/base/config + - abseil/container/hashtablez_sampler (1.20200225.0): + - abseil/base/base + - abseil/base/core_headers + - abseil/base/exponential_biased + - abseil/container/have_sse + - abseil/debugging/stacktrace + - abseil/memory/memory + - abseil/synchronization/synchronization + - abseil/utility/utility + - abseil/container/have_sse (1.20200225.0) - abseil/container/inlined_vector (1.20200225.0): - abseil/algorithm/algorithm - abseil/base/core_headers @@ -63,6 +115,69 @@ PODS: - abseil/memory/memory - abseil/meta/type_traits - abseil/types/span + - abseil/container/layout (1.20200225.0): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/strings/strings + - abseil/types/span + - abseil/utility/utility + - abseil/container/raw_hash_set (1.20200225.0): + - abseil/base/bits + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/container/common + - abseil/container/compressed_tuple + - abseil/container/container_memory + - abseil/container/hash_policy_traits + - abseil/container/hashtable_debug_hooks + - abseil/container/hashtablez_sampler + - abseil/container/have_sse + - abseil/container/layout + - abseil/memory/memory + - abseil/meta/type_traits + - abseil/utility/utility + - abseil/debugging/debugging_internal (1.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/errno_saver + - abseil/base/raw_logging_internal + - abseil/debugging/demangle_internal (1.20200225.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/debugging/stacktrace (1.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/debugging/debugging_internal + - abseil/debugging/symbolize (1.20200225.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/malloc_internal + - abseil/base/raw_logging_internal + - abseil/debugging/debugging_internal + - abseil/debugging/demangle_internal + - abseil/functional/function_ref (1.20200225.0): + - abseil/base/base_internal + - abseil/meta/type_traits + - abseil/hash/city (1.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/hash/hash (1.20200225.0): + - abseil/base/core_headers + - abseil/base/endian + - abseil/container/fixed_array + - abseil/hash/city + - abseil/meta/type_traits + - abseil/numeric/int128 + - abseil/strings/strings + - abseil/types/optional + - abseil/types/variant + - abseil/utility/utility - abseil/memory/memory (1.20200225.0): - abseil/base/core_headers - abseil/meta/type_traits @@ -71,6 +186,35 @@ PODS: - abseil/numeric/int128 (1.20200225.0): - abseil/base/config - abseil/base/core_headers + - abseil/status/status (1.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/container/inlined_vector + - abseil/debugging/stacktrace + - abseil/debugging/symbolize + - abseil/strings/cord + - abseil/strings/str_format + - abseil/strings/strings + - abseil/types/optional + - abseil/strings/cord (1.20200225.0): + - abseil/base/base + - abseil/base/base_internal + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/raw_logging_internal + - abseil/container/fixed_array + - abseil/container/inlined_vector + - abseil/functional/function_ref + - abseil/meta/type_traits + - abseil/strings/cord_internal + - abseil/strings/internal + - abseil/strings/str_format + - abseil/strings/strings + - abseil/types/optional + - abseil/strings/cord_internal (1.20200225.0): + - abseil/meta/type_traits + - abseil/strings/strings - abseil/strings/internal (1.20200225.0): - abseil/base/config - abseil/base/core_headers @@ -98,6 +242,31 @@ PODS: - abseil/meta/type_traits - abseil/numeric/int128 - abseil/strings/internal + - abseil/synchronization/graphcycles_internal (1.20200225.0): + - abseil/base/base + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/malloc_internal + - abseil/base/raw_logging_internal + - abseil/synchronization/kernel_timeout_internal (1.20200225.0): + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/time/time + - abseil/synchronization/synchronization (1.20200225.0): + - abseil/base/atomic_hook + - abseil/base/base + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/malloc_internal + - abseil/base/raw_logging_internal + - abseil/debugging/stacktrace + - abseil/debugging/symbolize + - abseil/synchronization/graphcycles_internal + - abseil/synchronization/kernel_timeout_internal + - abseil/time/time - abseil/time/internal/cctz/civil_time (1.20200225.0): - abseil/base/config - abseil/time/internal/cctz/time_zone (1.20200225.0): @@ -114,6 +283,9 @@ PODS: - abseil/types/bad_optional_access (1.20200225.0): - abseil/base/config - abseil/base/raw_logging_internal + - abseil/types/bad_variant_access (1.20200225.0): + - abseil/base/config + - abseil/base/raw_logging_internal - abseil/types/optional (1.20200225.0): - abseil/base/base_internal - abseil/base/config @@ -127,66 +299,146 @@ PODS: - abseil/base/core_headers - abseil/base/throw_delegate - abseil/meta/type_traits + - abseil/types/variant (1.20200225.0): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/types/bad_variant_access + - abseil/utility/utility - abseil/utility/utility (1.20200225.0): - abseil/base/base_internal - abseil/base/config - abseil/meta/type_traits - - BoringSSL-GRPC (0.0.9): - - BoringSSL-GRPC/Implementation (= 0.0.9) - - BoringSSL-GRPC/Interface (= 0.0.9) - - BoringSSL-GRPC/Implementation (0.0.9): - - BoringSSL-GRPC/Interface (= 0.0.9) - - BoringSSL-GRPC/Interface (0.0.9) - - gRPC-Core (1.30.0): - - gRPC-Core/Implementation (= 1.30.0) - - gRPC-Core/Interface (= 1.30.0) - - gRPC-Core/Implementation (1.30.0): + - BoringSSL-GRPC (0.0.12): + - BoringSSL-GRPC/Implementation (= 0.0.12) + - BoringSSL-GRPC/Interface (= 0.0.12) + - BoringSSL-GRPC/Implementation (0.0.12): + - BoringSSL-GRPC/Interface (= 0.0.12) + - BoringSSL-GRPC/Interface (0.0.12) + - Firebase (6.22.0): + - Firebase/Core (= 6.22.0) + - Firebase/Core (6.22.0): + - Firebase/CoreOnly + - FirebaseAnalytics (= 6.4.1) + - Firebase/CoreOnly (6.22.0): + - FirebaseCore (= 6.6.6) + - FirebaseAnalytics (6.4.1): + - FirebaseCore (~> 6.6) + - FirebaseInstallations (~> 1.1) + - GoogleAppMeasurement (= 6.4.1) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/MethodSwizzler (~> 6.0) + - GoogleUtilities/Network (~> 6.0) + - "GoogleUtilities/NSData+zlib (~> 6.0)" + - nanopb (= 0.3.9011) + - FirebaseCore (6.6.6): + - FirebaseCoreDiagnostics (~> 1.2) + - FirebaseCoreDiagnosticsInterop (~> 1.2) + - GoogleUtilities/Environment (~> 6.5) + - GoogleUtilities/Logger (~> 6.5) + - FirebaseCoreDiagnostics (1.2.4): + - FirebaseCoreDiagnosticsInterop (~> 1.2) + - GoogleDataTransportCCTSupport (~> 3.0) + - GoogleUtilities/Environment (~> 6.5) + - GoogleUtilities/Logger (~> 6.5) + - nanopb (~> 0.3.901) + - FirebaseCoreDiagnosticsInterop (1.2.0) + - FirebaseInstallations (1.3.0): + - FirebaseCore (~> 6.6) + - GoogleUtilities/Environment (~> 6.6) + - GoogleUtilities/UserDefaults (~> 6.6) + - PromisesObjC (~> 1.2) + - GoogleAppMeasurement (6.4.1): + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/MethodSwizzler (~> 6.0) + - GoogleUtilities/Network (~> 6.0) + - "GoogleUtilities/NSData+zlib (~> 6.0)" + - nanopb (= 0.3.9011) + - GoogleDataTransport (6.2.1) + - GoogleDataTransportCCTSupport (3.0.0): + - GoogleDataTransport (~> 6.0) + - nanopb (~> 0.3.901) + - GoogleUtilities/AppDelegateSwizzler (6.7.2): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Environment (6.7.2): + - PromisesObjC (~> 1.2) + - GoogleUtilities/Logger (6.7.2): + - GoogleUtilities/Environment + - GoogleUtilities/MethodSwizzler (6.7.2): + - GoogleUtilities/Logger + - GoogleUtilities/Network (6.7.2): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (6.7.2)" + - GoogleUtilities/Reachability (6.7.2): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (6.7.2): + - GoogleUtilities/Logger + - gRPC-Core (1.32.0): + - gRPC-Core/Implementation (= 1.32.0) + - gRPC-Core/Interface (= 1.32.0) + - gRPC-Core/Implementation (1.32.0): + - abseil/base/base (= 1.20200225.0) + - abseil/container/flat_hash_set (= 1.20200225.0) - abseil/container/inlined_vector (= 1.20200225.0) - abseil/memory/memory (= 1.20200225.0) + - abseil/status/status (= 1.20200225.0) - abseil/strings/str_format (= 1.20200225.0) - abseil/strings/strings (= 1.20200225.0) + - abseil/synchronization/synchronization (= 1.20200225.0) - abseil/time/time (= 1.20200225.0) - abseil/types/optional (= 1.20200225.0) - - BoringSSL-GRPC (= 0.0.9) - - gRPC-Core/Interface (= 1.30.0) - - gRPC-Core/Interface (1.30.0) - - gRPC-ProtoRPC (1.30.0): - - gRPC-ProtoRPC/Legacy (= 1.30.0) - - gRPC-ProtoRPC/Legacy-Header (= 1.30.0) - - gRPC-ProtoRPC/Main (= 1.30.0) - - gRPC-ProtoRPC/Legacy (1.30.0): - - gRPC-ProtoRPC/Legacy-Header (= 1.30.0) - - gRPC-ProtoRPC/Main (= 1.30.0) - - gRPC-RxLibrary (= 1.30.0) - - gRPC/GRPCCore (= 1.30.0) + - BoringSSL-GRPC (= 0.0.12) + - gRPC-Core/Interface (= 1.32.0) + - gRPC-Core/Interface (1.32.0) + - gRPC-ProtoRPC (1.32.0): + - gRPC-ProtoRPC/Legacy (= 1.32.0) + - gRPC-ProtoRPC/Legacy-Header (= 1.32.0) + - gRPC-ProtoRPC/Main (= 1.32.0) + - gRPC-ProtoRPC/Legacy (1.32.0): + - gRPC-ProtoRPC/Legacy-Header (= 1.32.0) + - gRPC-ProtoRPC/Main (= 1.32.0) + - gRPC-RxLibrary (= 1.32.0) + - gRPC/GRPCCore (= 1.32.0) - Protobuf (~> 3.0) - - gRPC-ProtoRPC/Legacy-Header (1.30.0) - - gRPC-ProtoRPC/Main (1.30.0): - - gRPC-ProtoRPC/Legacy-Header (= 1.30.0) - - gRPC/Interface (= 1.30.0) + - gRPC-ProtoRPC/Legacy-Header (1.32.0) + - gRPC-ProtoRPC/Main (1.32.0): + - gRPC-ProtoRPC/Legacy-Header (= 1.32.0) + - gRPC/Interface (= 1.32.0) - Protobuf (~> 3.0) - - gRPC-RxLibrary (1.30.0): - - gRPC-RxLibrary/Implementation (= 1.30.0) - - gRPC-RxLibrary/Interface (= 1.30.0) - - gRPC-RxLibrary/Implementation (1.30.0): + - gRPC-RxLibrary (1.32.0): + - gRPC-RxLibrary/Implementation (= 1.32.0) + - gRPC-RxLibrary/Interface (= 1.32.0) + - gRPC-RxLibrary/Implementation (1.32.0): - gRPC-RxLibrary/Interface - - gRPC-RxLibrary/Interface (1.30.0) - - gRPC/GRPCCore (1.30.0): - - gRPC-Core (= 1.30.0) - - gRPC-RxLibrary (= 1.30.0) - - gRPC/Interface (= 1.30.0) - - gRPC/Interface-Legacy (= 1.30.0) - - gRPC/Interface (1.30.0): - - gRPC/Interface-Legacy (= 1.30.0) - - gRPC/Interface-Legacy (1.30.0): - - gRPC-RxLibrary/Interface (= 1.30.0) + - gRPC-RxLibrary/Interface (1.32.0) + - gRPC/GRPCCore (1.32.0): + - gRPC-Core (= 1.32.0) + - gRPC-RxLibrary (= 1.32.0) + - gRPC/Interface (= 1.32.0) + - gRPC/Interface-Legacy (= 1.32.0) + - gRPC/Interface (1.32.0): + - gRPC/Interface-Legacy (= 1.32.0) + - gRPC/Interface-Legacy (1.32.0): + - gRPC-RxLibrary/Interface (= 1.32.0) + - nanopb (0.3.9011): + - nanopb/decode (= 0.3.9011) + - nanopb/encode (= 0.3.9011) + - nanopb/decode (0.3.9011) + - nanopb/encode (0.3.9011) - OrderedDictionary (1.4) - - Protobuf (3.12.0) + - PromisesObjC (1.2.11) + - Protobuf (3.13.0) - Unirest (1.1.4) DEPENDENCIES: - "!ProtoCompiler" - "!ProtoCompiler-gRPCPlugin" + - Firebase (= 6.22) - OrderedDictionary - Protobuf - Unirest (~> 1.1.4) @@ -197,27 +449,51 @@ SPEC REPOS: - "!ProtoCompiler-gRPCPlugin" - abseil - BoringSSL-GRPC + - Firebase + - FirebaseAnalytics + - FirebaseCore + - FirebaseCoreDiagnostics + - FirebaseCoreDiagnosticsInterop + - FirebaseInstallations + - GoogleAppMeasurement + - GoogleDataTransport + - GoogleDataTransportCCTSupport + - GoogleUtilities - gRPC - gRPC-Core - gRPC-ProtoRPC - gRPC-RxLibrary + - nanopb - OrderedDictionary + - PromisesObjC - Protobuf - Unirest SPEC CHECKSUMS: - "!ProtoCompiler": de0debb7bbb50e352acea59459c82dbe7a819d5e - "!ProtoCompiler-gRPCPlugin": 3827ea971d9e473da5fc8ebbe567af55ba3d58f3 + "!ProtoCompiler": 5d2653f7510f8c4a15ebf03ad1516c3684fb68dd + "!ProtoCompiler-gRPCPlugin": a1e04dd6087e82e6c137eb3b58994d0ffa82bada abseil: 4fcdce446caa49368e0f5ba328cff93326c72a49 - BoringSSL-GRPC: 81df7d127d70ba5ef5dd3a5fa7ca5c918f1a3724 - gRPC: f3fc41611d50d403d7faafefb48feee9a1815bfa - gRPC-Core: 6a82e303eb39ab829f15ee386cddc3cd3c3a35e4 - gRPC-ProtoRPC: 6e759b7f9bb98127cf32dfed6a381ca0edb98f84 - gRPC-RxLibrary: d42eeb4b2522b8ab9122045e6e7f483956789090 + BoringSSL-GRPC: 0cd95890148852684de1b0eaabd54f299a00b129 + Firebase: 32f9520684e87c7af3f0704f7f88042626d6b536 + FirebaseAnalytics: 83f822fd0d33a46f49f89b8c3ab16ab4d89df08a + FirebaseCore: 9aca0f1fffb405176ba15311a5621fcde4106fcf + FirebaseCoreDiagnostics: b59c024493a409f8aecba02c99928d0d8431d159 + FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850 + FirebaseInstallations: 6f5f680e65dc374397a483c32d1799ba822a395b + GoogleAppMeasurement: e49be3954045b17d046f271b9cc1ec052bad9702 + GoogleDataTransport: 9a8a16f79feffc7f42096743de2a7c4815e84020 + GoogleDataTransportCCTSupport: 0f39025e8cf51f168711bd3fb773938d7e62ddb5 + GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 + gRPC: 9f6be4f675ef68e319e8626f7d9d3ea032967552 + gRPC-Core: 513194cf993ff0ec0f95accf7f9c663a0cc15da9 + gRPC-ProtoRPC: edf9a20c8c43945f073037b499545f3845ec74d6 + gRPC-RxLibrary: 82958ff4e5b7c498fa3332638d15afb4bfac7227 + nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd OrderedDictionary: 138c8d2e358d3a0c9adda15c6c7db24e8e3b09e6 - Protobuf: 2793fcd0622a00b546c60e7cbbcc493e043e9bb9 + PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f + Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748 Unirest: 5e4d93eaf32463bf619a4ecd3bbc8c32acf21eac -PODFILE CHECKSUM: 3fb1926fbc4f29ade609df19ba97fb74a2e1dcb4 +PODFILE CHECKSUM: e77e247c3e5576bdb1d4b73b6e88f8c91719c979 COCOAPODS: 1.9.3