diff --git a/Podfile.lock b/Podfile.lock index c9f28d6..7bfeeb8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,53 +1,55 @@ PODS: - - BoringSSL (10.0.6): - - BoringSSL/Implementation (= 10.0.6) - - BoringSSL/Interface (= 10.0.6) - - BoringSSL/Implementation (10.0.6): - - BoringSSL/Interface (= 10.0.6) - - BoringSSL/Interface (10.0.6) + - BoringSSL-GRPC (0.0.2): + - BoringSSL-GRPC/Implementation (= 0.0.2) + - BoringSSL-GRPC/Interface (= 0.0.2) + - BoringSSL-GRPC/Implementation (0.0.2): + - BoringSSL-GRPC/Interface (= 0.0.2) + - BoringSSL-GRPC/Interface (0.0.2) - FirebaseABTesting (2.0.0): - FirebaseCore (~> 5.0) - Protobuf (~> 3.5) - - FirebaseAnalytics (5.3.0): - - FirebaseCore (~> 5.1) - - FirebaseInstanceID (~> 3.3) - - GoogleAppMeasurement (~> 5.3) + - FirebaseAnalytics (5.5.0): + - FirebaseCore (~> 5.2) + - FirebaseInstanceID (~> 3.4) + - GoogleAppMeasurement (= 5.5.0) - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - GoogleUtilities/MethodSwizzler (~> 5.2) - GoogleUtilities/Network (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - nanopb (~> 0.3) - - FirebaseAuth (5.0.5): + - FirebaseAuth (5.3.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.1) + - FirebaseCore (~> 5.2) - GoogleUtilities/Environment (~> 5.2) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.1.8): + - FirebaseCore (5.2.0): - GoogleUtilities/Logger (~> 5.2) - - FirebaseDatabase (5.0.3): - - FirebaseCore (~> 5.0) + - FirebaseDatabase (5.1.0): + - FirebaseAuthInterop (~> 1.0) + - FirebaseCore (~> 5.2) - leveldb-library (~> 1.18) - - FirebaseFirestore (0.15.0): + - FirebaseFirestore (1.0.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.1) - - FirebaseFirestore/abseil-cpp (= 0.15.0) - - "gRPC-C++ (~> 0.0.3)" + - FirebaseCore (~> 5.2) + - FirebaseFirestore/abseil-cpp (= 1.0.0) + - "gRPC-C++ (= 0.0.6)" - leveldb-library (~> 1.20) - - nanopb (~> 0.3.8) + - nanopb (~> 0.3.901) - Protobuf (~> 3.1) - - FirebaseFirestore/abseil-cpp (0.15.0): + - FirebaseFirestore/abseil-cpp (1.0.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.1) - - "gRPC-C++ (~> 0.0.3)" + - FirebaseCore (~> 5.2) + - "gRPC-C++ (= 0.0.6)" - leveldb-library (~> 1.20) - - nanopb (~> 0.3.8) + - nanopb (~> 0.3.901) - Protobuf (~> 3.1) - - FirebaseFunctions (2.1.1): - - FirebaseCore (~> 5.0) + - FirebaseFunctions (2.2.0): + - FirebaseAuthInterop (~> 1.0) + - FirebaseCore (~> 5.2) - GTMSessionFetcher/Core (~> 1.1) - - FirebaseInstanceID (3.3.0): - - FirebaseCore (~> 5.1) + - FirebaseInstanceID (3.4.0): + - FirebaseCore (~> 5.2) - GoogleUtilities/Environment (~> 5.3) - GoogleUtilities/UserDefaults (~> 5.3) - FirebaseRemoteConfig (3.1.0): @@ -58,50 +60,50 @@ PODS: - GoogleUtilities/Environment (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - Protobuf (~> 3.5) - - FirebaseStorage (3.0.3): + - FirebaseStorage (3.1.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.1) + - FirebaseCore (~> 5.2) - GTMSessionFetcher/Core (~> 1.1) - - GoogleAppMeasurement (5.3.0): + - GoogleAppMeasurement (5.5.0): - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - GoogleUtilities/MethodSwizzler (~> 5.2) - GoogleUtilities/Network (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - nanopb (~> 0.3) - - GoogleUtilities/AppDelegateSwizzler (5.3.6): + - GoogleUtilities/AppDelegateSwizzler (5.3.7): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (5.3.6) - - GoogleUtilities/Logger (5.3.6): + - GoogleUtilities/Environment (5.3.7) + - GoogleUtilities/Logger (5.3.7): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (5.3.6): + - GoogleUtilities/MethodSwizzler (5.3.7): - GoogleUtilities/Logger - - GoogleUtilities/Network (5.3.6): + - GoogleUtilities/Network (5.3.7): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (5.3.6)" - - GoogleUtilities/Reachability (5.3.6): + - "GoogleUtilities/NSData+zlib (5.3.7)" + - GoogleUtilities/Reachability (5.3.7): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (5.3.6): + - GoogleUtilities/UserDefaults (5.3.7): - GoogleUtilities/Logger - - "gRPC-C++ (0.0.5)": - - "gRPC-C++/Implementation (= 0.0.5)" - - "gRPC-C++/Interface (= 0.0.5)" - - "gRPC-C++/Implementation (0.0.5)": - - "gRPC-C++/Interface (= 0.0.5)" - - gRPC-Core (= 1.14.0) + - "gRPC-C++ (0.0.6)": + - "gRPC-C++/Implementation (= 0.0.6)" + - "gRPC-C++/Interface (= 0.0.6)" + - "gRPC-C++/Implementation (0.0.6)": + - "gRPC-C++/Interface (= 0.0.6)" + - gRPC-Core (= 1.17.0) - nanopb (~> 0.3) - - "gRPC-C++/Interface (0.0.5)" - - gRPC-Core (1.14.0): - - gRPC-Core/Implementation (= 1.14.0) - - gRPC-Core/Interface (= 1.14.0) - - gRPC-Core/Implementation (1.14.0): - - BoringSSL (~> 10.0) - - gRPC-Core/Interface (= 1.14.0) + - "gRPC-C++/Interface (0.0.6)" + - gRPC-Core (1.17.0): + - gRPC-Core/Implementation (= 1.17.0) + - gRPC-Core/Interface (= 1.17.0) + - gRPC-Core/Implementation (1.17.0): + - BoringSSL-GRPC (= 0.0.2) + - gRPC-Core/Interface (= 1.17.0) - nanopb (~> 0.3) - - gRPC-Core/Interface (1.14.0) + - gRPC-Core/Interface (1.17.0) - GTMSessionFetcher/Core (1.2.1) - leveldb-library (1.20) - nanopb (0.3.901): @@ -123,7 +125,7 @@ PODS: - RxCocoa (~> 4) - RxSwift (~> 4) - RxFirebase/Firestore (0.2.6): - - FirebaseFirestore (~> 0.15) + - FirebaseFirestore (~> 1) - RxCocoa (~> 4) - RxSwift (~> 4) - RxFirebase/Functions (0.2.6): @@ -151,7 +153,7 @@ DEPENDENCIES: SPEC REPOS: https://github.com/cocoapods/specs.git: - - BoringSSL + - BoringSSL-GRPC - FirebaseABTesting - FirebaseAnalytics - FirebaseAuth @@ -180,29 +182,29 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - BoringSSL: e10f92a27043805c01071fe815a5cd98ae8212e7 + BoringSSL-GRPC: 2a230d9cd93e7ce39916044f645cebb31f37dde6 FirebaseABTesting: 1f50b8d50f5e3469eea54e7463a7b7fe221d1f5e - FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba - FirebaseAuth: 9299ab178271bec7426967b05b2718bb6fc31f17 + FirebaseAnalytics: d35d47c03c50c73c14a7fd31463c5775843e78a9 + FirebaseAuth: c9b3ff063c223d2841d97240af547ce511bce19a FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: fba2bfaa691c49028309b92e4dd37cc4b5512fbe - FirebaseDatabase: e2bcbc106adc4b11a2da3ec2eb63c0c4a44f2f54 - FirebaseFirestore: 9e9411f13a0aba72d4f631899611d09e43734c48 - FirebaseFunctions: 6c03d7c5d62520be4678dc3fb7957654aab82b4f - FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e + FirebaseCore: ea2d1816723ef21492b8e9113303e1350db5e08c + FirebaseDatabase: 23acb0c53cd4d4070a427b60100b2e4aaa97c45d + FirebaseFirestore: 6f2b93b4f7bb8416628142763c91ccc00fa04c86 + FirebaseFunctions: f35dd01ba4cfd036c1c521b3ed99851d7ec08c70 + FirebaseInstanceID: 97ea7a5dca9afd72c79bfcdddb7a44aa1cbb42a1 FirebaseRemoteConfig: 7e11c65f0769c09bff6947997c209515058c5318 - FirebaseStorage: 3d22c041370593e639fba013d1eb698a8dae2881 - GoogleAppMeasurement: 5029d78f2b438bd30ffb44e6c558b57c21622727 - GoogleUtilities: 95996bea7c7d9b8fb811b7507669a4a8762f80c7 - "gRPC-C++": 19eec1ffd34de29453f5fab5b4697ad0f240ad51 - gRPC-Core: f4836515817c0eb479aeeb9cc27c91c4ba62a9f6 + FirebaseStorage: 29075f874c2b3cf61e5221a62c4ceefc809e5412 + GoogleAppMeasurement: 621f3bc6211d5ba548debe01fafad30cf5ab6859 + GoogleUtilities: 111a012f4c3a29c9e7c954c082fafd6ee3c999c0 + "gRPC-C++": e76441995900ac90e9bd98644ab4733f12521edf + gRPC-Core: 4028031ed2c5267cca0d846c876d8046b1ecb9b6 GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5 RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749 - RxFirebase: 59dac19f88ef0ae11e89ff7cff377d35a466c96e + RxFirebase: 90cdbd288d2cc2bd0c6d2614eb9b8715f5628427 RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973 PODFILE CHECKSUM: db4e0a593103ec732f32da4bf8e8163883660ceb diff --git a/RxFirebase.podspec b/RxFirebase.podspec index 6c6cf5a..63b769e 100644 --- a/RxFirebase.podspec +++ b/RxFirebase.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| s.subspec 'Firestore' do |firestore| firestore.source_files = 'Sources/Firestore/**/*' - firestore.dependency 'FirebaseFirestore', '~> 0.15' + firestore.dependency 'FirebaseFirestore', '~> 1' end s.subspec 'RemoteConfig' do |remote| remote.source_files = 'Sources/RemoteConfig/**/*' diff --git a/RxFirebase.xcodeproj/project.pbxproj b/RxFirebase.xcodeproj/project.pbxproj index 9732350..7800734 100644 --- a/RxFirebase.xcodeproj/project.pbxproj +++ b/RxFirebase.xcodeproj/project.pbxproj @@ -171,7 +171,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, F8E61F8D59E53C6D306BEF7A /* [CP] Embed Pods Frameworks */, - A59B7F1DE02F6C7B568B1E8F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -262,28 +261,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - A59B7F1DE02F6C7B568B1E8F /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseFirestore/gRPCCertificates.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; DC29F84E2AC3FEA6B3C2358F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -327,7 +304,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework", + "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", @@ -341,7 +318,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",