diff --git a/Podfile.lock b/Podfile.lock index 411d446..d976212 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -8,137 +8,138 @@ PODS: - FirebaseABTesting (2.0.0): - FirebaseCore (~> 5.0) - Protobuf (~> 3.5) - - FirebaseAnalytics (5.1.1): + - FirebaseAnalytics (5.3.0): - FirebaseCore (~> 5.1) - - FirebaseInstanceID (~> 3.2) - - GoogleAppMeasurement (~> 5.1) - - GoogleUtilities/AppDelegateSwizzler (~> 5.2.0) - - GoogleUtilities/MethodSwizzler (~> 5.2.0) + - FirebaseInstanceID (~> 3.3) + - GoogleAppMeasurement (~> 5.3) + - GoogleUtilities/AppDelegateSwizzler (~> 5.2) + - GoogleUtilities/MethodSwizzler (~> 5.2) - GoogleUtilities/Network (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - nanopb (~> 0.3) - - FirebaseAuth (5.0.3): + - FirebaseAuth (5.0.5): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.0) + - FirebaseCore (~> 5.1) - GoogleUtilities/Environment (~> 5.2) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.1.2): + - FirebaseCore (5.1.8): - GoogleUtilities/Logger (~> 5.2) - - FirebaseDatabase (5.0.2): + - FirebaseDatabase (5.0.3): - FirebaseCore (~> 5.0) - leveldb-library (~> 1.18) - - FirebaseFirestore (0.13.2): + - FirebaseFirestore (0.15.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.0) - - FirebaseFirestore/abseil-cpp (= 0.13.2) - - gRPC-ProtoRPC (~> 1.0) - - leveldb-library (~> 1.18) + - FirebaseCore (~> 5.1) + - FirebaseFirestore/abseil-cpp (= 0.15.0) + - "gRPC-C++ (~> 0.0.3)" + - leveldb-library (~> 1.20) - nanopb (~> 0.3.8) - Protobuf (~> 3.1) - - FirebaseFirestore/abseil-cpp (0.13.2): + - FirebaseFirestore/abseil-cpp (0.15.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.0) - - gRPC-ProtoRPC (~> 1.0) - - leveldb-library (~> 1.18) + - FirebaseCore (~> 5.1) + - "gRPC-C++ (~> 0.0.3)" + - leveldb-library (~> 1.20) - nanopb (~> 0.3.8) - Protobuf (~> 3.1) - FirebaseFunctions (2.1.1): - FirebaseCore (~> 5.0) - GTMSessionFetcher/Core (~> 1.1) - - FirebaseInstanceID (3.2.1): + - FirebaseInstanceID (3.3.0): - FirebaseCore (~> 5.1) - - GoogleUtilities/Environment (~> 5.2) - - FirebaseRemoteConfig (3.0.1): + - GoogleUtilities/Environment (~> 5.3) + - GoogleUtilities/UserDefaults (~> 5.3) + - FirebaseRemoteConfig (3.1.0): - FirebaseABTesting (~> 2.0) - - FirebaseAnalytics (~> 5.1) + - FirebaseAnalytics (~> 5.3) - FirebaseCore (~> 5.1) - - FirebaseInstanceID (~> 3.2) + - FirebaseInstanceID (~> 3.3) - GoogleUtilities/Environment (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - Protobuf (~> 3.5) - - FirebaseStorage (3.0.1): - - FirebaseCore (~> 5.0) + - FirebaseStorage (3.0.3): + - FirebaseAuthInterop (~> 1.0) + - FirebaseCore (~> 5.1) - GTMSessionFetcher/Core (~> 1.1) - - GoogleAppMeasurement (5.1.1): - - GoogleUtilities/AppDelegateSwizzler (~> 5.2.0) - - GoogleUtilities/MethodSwizzler (~> 5.2.0) + - GoogleAppMeasurement (5.3.0): + - GoogleUtilities/AppDelegateSwizzler (~> 5.2) + - GoogleUtilities/MethodSwizzler (~> 5.2) - GoogleUtilities/Network (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - nanopb (~> 0.3) - - GoogleUtilities/AppDelegateSwizzler (5.2.2): + - GoogleUtilities/AppDelegateSwizzler (5.3.6): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (5.2.2) - - GoogleUtilities/Logger (5.2.2): + - GoogleUtilities/Environment (5.3.6) + - GoogleUtilities/Logger (5.3.6): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (5.2.2): + - GoogleUtilities/MethodSwizzler (5.3.6): - GoogleUtilities/Logger - - GoogleUtilities/Network (5.2.2): + - GoogleUtilities/Network (5.3.6): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (5.2.2)" - - GoogleUtilities/Reachability (5.2.2): + - "GoogleUtilities/NSData+zlib (5.3.6)" + - GoogleUtilities/Reachability (5.3.6): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (5.3.6): - GoogleUtilities/Logger - - gRPC (1.14.1): - - gRPC-RxLibrary (= 1.14.1) - - gRPC/Main (= 1.14.1) - - gRPC-Core (1.14.1): - - gRPC-Core/Implementation (= 1.14.1) - - gRPC-Core/Interface (= 1.14.1) - - gRPC-Core/Implementation (1.14.1): + - "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) + - 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.1) + - gRPC-Core/Interface (= 1.14.0) - nanopb (~> 0.3) - - gRPC-Core/Interface (1.14.1) - - gRPC-ProtoRPC (1.14.1): - - gRPC-ProtoRPC/Main (= 1.14.1) - - gRPC-ProtoRPC/Main (1.14.1): - - gRPC (= 1.14.1) - - gRPC-RxLibrary (= 1.14.1) - - Protobuf (~> 3.0) - - gRPC-RxLibrary (1.14.1) - - gRPC/Main (1.14.1): - - gRPC-Core (= 1.14.1) - - gRPC-RxLibrary (= 1.14.1) - - GTMSessionFetcher/Core (1.2.0) + - gRPC-Core/Interface (1.14.0) + - GTMSessionFetcher/Core (1.2.1) - leveldb-library (1.20) - - nanopb (0.3.8): - - nanopb/decode (= 0.3.8) - - nanopb/encode (= 0.3.8) - - nanopb/decode (0.3.8) - - nanopb/encode (0.3.8) + - nanopb (0.3.901): + - nanopb/decode (= 0.3.901) + - nanopb/encode (= 0.3.901) + - nanopb/decode (0.3.901) + - nanopb/encode (0.3.901) - Protobuf (3.6.1) - - RxCocoa (4.2.0): + - RxAtomic (4.4.0) + - RxCocoa (4.4.0): - RxSwift (~> 4.0) - - RxFirebase/Auth (0.2.4): + - RxFirebase/Auth (0.2.6): - FirebaseAuth (~> 5) - FirebaseCore (~> 5.1) - RxCocoa (~> 4) - RxSwift (~> 4) - - RxFirebase/Database (0.2.4): + - RxFirebase/Database (0.2.6): - FirebaseDatabase (~> 5) - RxCocoa (~> 4) - RxSwift (~> 4) - - RxFirebase/Firestore (0.2.4): - - FirebaseFirestore (~> 0.12) + - RxFirebase/Firestore (0.2.6): + - FirebaseFirestore (~> 0.15) - RxCocoa (~> 4) - RxSwift (~> 4) - - RxFirebase/Functions (0.2.4): + - RxFirebase/Functions (0.2.6): - FirebaseFunctions (~> 2) - RxCocoa (~> 4) - RxSwift (~> 4) - - RxFirebase/RemoteConfig (0.2.4): + - RxFirebase/RemoteConfig (0.2.6): - FirebaseRemoteConfig (~> 3) - RxCocoa (~> 4) - RxSwift (~> 4) - - RxFirebase/Storage (0.2.4): + - RxFirebase/Storage (0.2.6): - FirebaseStorage (~> 3) - RxCocoa (~> 4) - RxSwift (~> 4) - - RxSwift (4.2.0) + - RxSwift (4.4.0): + - RxAtomic (~> 4.4) DEPENDENCIES: - RxFirebase/Auth (from `./`) @@ -164,14 +165,13 @@ SPEC REPOS: - FirebaseStorage - GoogleAppMeasurement - GoogleUtilities - - gRPC + - "gRPC-C++" - gRPC-Core - - gRPC-ProtoRPC - - gRPC-RxLibrary - GTMSessionFetcher - leveldb-library - nanopb - Protobuf + - RxAtomic - RxCocoa - RxSwift @@ -182,30 +182,29 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BoringSSL: e10f92a27043805c01071fe815a5cd98ae8212e7 FirebaseABTesting: 1f50b8d50f5e3469eea54e7463a7b7fe221d1f5e - FirebaseAnalytics: 993577e91157feb40945abedd6ab346d8a4b6ac8 - FirebaseAuth: 657a25e4be044d2d333663ebf515a861c5a59cd7 + FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba + FirebaseAuth: 9299ab178271bec7426967b05b2718bb6fc31f17 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 3a97432acb324b439fbed338e642f9cbb516a63d - FirebaseDatabase: 27be5ac5bc75e0b17537b2bbfada8258addcc8cd - FirebaseFirestore: 7eec93809ad61e7ebe303089c5cc5efa63424b72 + FirebaseCore: fba2bfaa691c49028309b92e4dd37cc4b5512fbe + FirebaseDatabase: e2bcbc106adc4b11a2da3ec2eb63c0c4a44f2f54 + FirebaseFirestore: 9e9411f13a0aba72d4f631899611d09e43734c48 FirebaseFunctions: 6c03d7c5d62520be4678dc3fb7957654aab82b4f - FirebaseInstanceID: ea5af6920d0a4a29b40459d055bebe4a6c1333c4 - FirebaseRemoteConfig: 7b6d675dfb11f0e0e638caee00908b06af150d56 - FirebaseStorage: 43f823b96b72a08539eba21a7de043348a69d4c6 - GoogleAppMeasurement: f7507b39b70ad0bd80b3d81518b2f43868974307 - GoogleUtilities: 06b66f9567769a7958db20a92f0128b2843e49d5 - gRPC: 65fa2a50c4fd61940b76f4962d75c239c92c6a8d - gRPC-Core: e3ace1e1161e75903135de8d8231bb69c9d35721 - gRPC-ProtoRPC: 78f976fc6a1eafc0e1f4965c255c313aa0859b1e - gRPC-RxLibrary: c4c826507ad3c8c8fab6887f153938eb04b86d59 - GTMSessionFetcher: 0c4baf0a73acd0041bf9f71ea018deedab5ea84e + FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e + FirebaseRemoteConfig: 7e11c65f0769c09bff6947997c209515058c5318 + FirebaseStorage: 3d22c041370593e639fba013d1eb698a8dae2881 + GoogleAppMeasurement: 5029d78f2b438bd30ffb44e6c558b57c21622727 + GoogleUtilities: 95996bea7c7d9b8fb811b7507669a4a8762f80c7 + "gRPC-C++": 19eec1ffd34de29453f5fab5b4697ad0f240ad51 + gRPC-Core: f4836515817c0eb479aeeb9cc27c91c4ba62a9f6 + GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 - nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 + nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5 - RxCocoa: 0b54909c902e1e581212a03e690bbd94032d8baa - RxFirebase: 223375f163b3e5ed7db665e3fc596851840131be - RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104 + RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f + RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749 + RxFirebase: 60c063fa68dac3b9dc6a72a80236d55db530a970 + RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973 PODFILE CHECKSUM: db4e0a593103ec732f32da4bf8e8163883660ceb -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.0.beta.2 diff --git a/RxFirebase.podspec b/RxFirebase.podspec index 7401f86..6c6cf5a 100644 --- a/RxFirebase.podspec +++ b/RxFirebase.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'RxFirebase' - s.version = '0.2.5' + s.version = '0.2.6' s.summary = 'RxSwift extensions for Firebase.' # This description is used to generate tags and improve search results. @@ -32,13 +32,16 @@ Pod::Spec.new do |s| s.cocoapods_version = '>= 1.4.0' s.swift_version = '4.0' s.ios.deployment_target = '8.0' + s.tvos.deployment_target = '10.0' + s.osx.deployment_target = '10.10' + s.static_framework = true s.dependency 'RxSwift', '~> 4' s.dependency 'RxCocoa', '~> 4' s.subspec 'Firestore' do |firestore| firestore.source_files = 'Sources/Firestore/**/*' - firestore.dependency 'FirebaseFirestore', '~> 0.12' + firestore.dependency 'FirebaseFirestore', '~> 0.15' end s.subspec 'RemoteConfig' do |remote| remote.source_files = 'Sources/RemoteConfig/**/*' diff --git a/RxFirebase.xcodeproj/project.pbxproj b/RxFirebase.xcodeproj/project.pbxproj index b1eaecb..16b61a5 100644 --- a/RxFirebase.xcodeproj/project.pbxproj +++ b/RxFirebase.xcodeproj/project.pbxproj @@ -171,6 +171,7 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, F8E61F8D59E53C6D306BEF7A /* [CP] Embed Pods Frameworks */, + A59B7F1DE02F6C7B568B1E8F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -261,6 +262,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + A59B7F1DE02F6C7B568B1E8F /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_ROOT}/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 = "\"${PODS_ROOT}/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; DC29F84E2AC3FEA6B3C2358F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -303,17 +326,16 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", - "${BUILT_PRODUCTS_DIR}/gRPC/GRPCClient.framework", + "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-ProtoRPC/ProtoRPC.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-RxLibrary/RxLibrary.framework", "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", ); @@ -323,18 +345,17 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRPCClient.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ProtoRPC.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxLibrary.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */