diff --git a/ios/Podfile b/ios/Podfile index 9522915d4..410ea5c67 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -5,10 +5,10 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ target 'jitsi-meet' do project 'app/app.xcodeproj' - pod 'Crashlytics', '~> 3.12.0' - pod 'Fabric', '~> 1.9.0' - pod 'Firebase/Core', '~> 5.18.0' - pod 'Firebase/DynamicLinks', '~> 5.18.0' + pod 'Crashlytics', '~> 3.14.0' + pod 'Fabric', '~> 1.10.2' + pod 'Firebase/Core', '~> 6.16.0' + pod 'Firebase/DynamicLinks', '~> 6.16.0' end target 'JitsiMeet' do diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1ca64dc0c..cf3ef954e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -11,10 +11,10 @@ PODS: - CocoaLumberjack (3.5.3): - CocoaLumberjack/Core (= 3.5.3) - CocoaLumberjack/Core (3.5.3) - - Crashlytics (3.12.0): - - Fabric (~> 1.9.0) + - Crashlytics (3.14.0): + - Fabric (~> 1.10.2) - DoubleConversion (1.1.6) - - Fabric (1.9.0) + - Fabric (1.10.2) - FBLazyVector (0.61.5-jitsi.1) - FBReactNativeSpec (0.61.5-jitsi.1): - Folly (= 2018.10.22.00) @@ -23,34 +23,48 @@ PODS: - React-Core (= 0.61.5-jitsi.1) - React-jsi (= 0.61.5-jitsi.1) - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1) - - Firebase/Core (5.18.0): + - Firebase/Core (6.16.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 5.7.0) - - Firebase/CoreOnly (5.18.0): - - FirebaseCore (= 5.3.1) - - Firebase/DynamicLinks (5.18.0): + - FirebaseAnalytics (= 6.2.2) + - Firebase/CoreOnly (6.16.0): + - FirebaseCore (= 6.6.1) + - Firebase/DynamicLinks (6.16.0): - Firebase/CoreOnly - - FirebaseDynamicLinks (= 3.4.1) - - FirebaseAnalytics (5.7.0): - - FirebaseCore (~> 5.3) - - FirebaseInstanceID (~> 3.6) - - GoogleAppMeasurement (= 5.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - - GoogleUtilities/MethodSwizzler (~> 5.2) - - GoogleUtilities/Network (~> 5.2) - - "GoogleUtilities/NSData+zlib (~> 5.2)" - - nanopb (~> 0.3) - - FirebaseAnalyticsInterop (1.2.0) - - FirebaseCore (5.3.1): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseDynamicLinks (3.4.1): - - FirebaseAnalytics (~> 5.1) - - FirebaseAnalyticsInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - FirebaseInstanceID (3.7.0): - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.2) - - GoogleUtilities/UserDefaults (~> 5.2) + - FirebaseDynamicLinks (~> 4.0.6) + - FirebaseAnalytics (6.2.2): + - FirebaseCore (~> 6.6) + - FirebaseInstanceID (~> 4.3) + - GoogleAppMeasurement (= 6.2.2) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/MethodSwizzler (~> 6.0) + - GoogleUtilities/Network (~> 6.0) + - "GoogleUtilities/NSData+zlib (~> 6.0)" + - nanopb (= 0.3.9011) + - FirebaseAnalyticsInterop (1.5.0) + - FirebaseCore (6.6.1): + - FirebaseCoreDiagnostics (~> 1.2) + - FirebaseCoreDiagnosticsInterop (~> 1.2) + - GoogleUtilities/Environment (~> 6.5) + - GoogleUtilities/Logger (~> 6.5) + - FirebaseCoreDiagnostics (1.2.2): + - FirebaseCoreDiagnosticsInterop (~> 1.2) + - GoogleDataTransportCCTSupport (~> 2.0) + - GoogleUtilities/Environment (~> 6.5) + - GoogleUtilities/Logger (~> 6.5) + - nanopb (~> 0.3.901) + - FirebaseCoreDiagnosticsInterop (1.2.0) + - FirebaseDynamicLinks (4.0.8): + - FirebaseAnalyticsInterop (~> 1.3) + - FirebaseCore (~> 6.2) + - FirebaseInstallations (1.1.1): + - FirebaseCore (~> 6.6) + - GoogleUtilities/UserDefaults (~> 6.5) + - PromisesObjC (~> 1.2) + - FirebaseInstanceID (4.3.2): + - FirebaseCore (~> 6.6) + - FirebaseInstallations (~> 1.0) + - GoogleUtilities/Environment (~> 6.5) + - GoogleUtilities/UserDefaults (~> 6.5) - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -61,33 +75,37 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - GoogleAppMeasurement (5.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - - GoogleUtilities/MethodSwizzler (~> 5.2) - - GoogleUtilities/Network (~> 5.2) - - "GoogleUtilities/NSData+zlib (~> 5.2)" - - nanopb (~> 0.3) + - GoogleAppMeasurement (6.2.2): + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/MethodSwizzler (~> 6.0) + - GoogleUtilities/Network (~> 6.0) + - "GoogleUtilities/NSData+zlib (~> 6.0)" + - nanopb (= 0.3.9011) + - GoogleDataTransport (5.1.0) + - GoogleDataTransportCCTSupport (2.0.1): + - GoogleDataTransport (~> 5.1) + - nanopb (~> 0.3.901) - GoogleSignIn (5.0.1): - AppAuth (~> 1.2) - GTMAppAuth (~> 1.0) - GTMSessionFetcher/Core (~> 1.1) - - GoogleUtilities/AppDelegateSwizzler (5.4.1): + - GoogleUtilities/AppDelegateSwizzler (6.5.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (5.4.1) - - GoogleUtilities/Logger (5.4.1): + - GoogleUtilities/Environment (6.5.2) + - GoogleUtilities/Logger (6.5.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (5.4.1): + - GoogleUtilities/MethodSwizzler (6.5.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (5.4.1): + - GoogleUtilities/Network (6.5.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (5.4.1)" - - GoogleUtilities/Reachability (5.4.1): + - "GoogleUtilities/NSData+zlib (6.5.2)" + - GoogleUtilities/Reachability (6.5.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (5.4.1): + - GoogleUtilities/UserDefaults (6.5.2): - GoogleUtilities/Logger - GTMAppAuth (1.0.0): - AppAuth/Core (~> 1.0) @@ -97,12 +115,13 @@ PODS: - GTMSessionFetcher/Core (1.2.2) - GTMSessionFetcher/Full (1.2.2): - GTMSessionFetcher/Core (= 1.2.2) - - nanopb (0.3.901): - - nanopb/decode (= 0.3.901) - - nanopb/encode (= 0.3.901) - - nanopb/decode (0.3.901) - - nanopb/encode (0.3.901) + - nanopb (0.3.9011): + - nanopb/decode (= 0.3.9011) + - nanopb/encode (= 0.3.9011) + - nanopb/decode (0.3.9011) + - nanopb/encode (0.3.9011) - ObjectiveDropboxOfficial (3.9.4) + - PromisesObjC (1.2.8) - RCTRequired (0.61.5-jitsi.1) - RCTTypeSafety (0.61.5-jitsi.1): - FBLazyVector (= 0.61.5-jitsi.1) @@ -352,13 +371,13 @@ DEPENDENCIES: - Amplitude-iOS (~> 4.0.4) - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - CocoaLumberjack (~> 3.5.3) - - Crashlytics (~> 3.12.0) + - Crashlytics (~> 3.14.0) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - - Fabric (~> 1.9.0) + - Fabric (~> 1.10.2) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`) - - Firebase/Core (~> 5.18.0) - - Firebase/DynamicLinks (~> 5.18.0) + - Firebase/Core (~> 6.16.0) + - Firebase/DynamicLinks (~> 6.16.0) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - ObjectiveDropboxOfficial (~> 3.9.4) @@ -401,23 +420,29 @@ SPEC REPOS: - Amplitude-iOS - boost-for-react-native - CocoaLumberjack + - ObjectiveDropboxOfficial + trunk: + - AppAuth - Crashlytics - Fabric - Firebase - FirebaseAnalytics - FirebaseAnalyticsInterop - FirebaseCore + - FirebaseCoreDiagnostics + - FirebaseCoreDiagnosticsInterop - FirebaseDynamicLinks + - FirebaseInstallations - FirebaseInstanceID - GoogleAppMeasurement - - GoogleUtilities - - nanopb - - ObjectiveDropboxOfficial - trunk: - - AppAuth + - GoogleDataTransport + - GoogleDataTransportCCTSupport - GoogleSignIn + - GoogleUtilities - GTMAppAuth - GTMSessionFetcher + - nanopb + - PromisesObjC EXTERNAL SOURCES: BVLinearGradient: @@ -501,26 +526,32 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 - Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933 + Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - Fabric: f988e33c97f08930a413e08123064d2e5f68d655 + Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74 FBLazyVector: 4a5251159a3ed05dc11cc8b74cf937869935814b FBReactNativeSpec: 6fa602a20993212cc9877a81838578ffb0008bc9 - Firebase: 02f3281965c075426141a0ce1277e9de6649cab9 - FirebaseAnalytics: 23851fe602c872130a2c5c55040b302120346cc2 - FirebaseAnalyticsInterop: efbe45c8385ec626e29f9525e5ebd38520dfb6c1 - FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3 - FirebaseDynamicLinks: f209c3caccd82102caa0e91d393e3ccc593501fd - FirebaseInstanceID: bd6fc5a258884e206fd5c474ebe4f5b00e21770e + Firebase: 497158b816d0a86fc31babbd05546fcd7e6083ff + FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee + FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae + FirebaseCore: 85064903ed6c28e47fec9c7bd149d94ba1b6b6e7 + FirebaseCoreDiagnostics: e9b4cd8ba60dee0f2d13347332e4b7898cca5b61 + FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850 + FirebaseDynamicLinks: 417dc6dbb6013233c77558290d73296f429656a6 + FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44 + FirebaseInstanceID: 7ee0d6777013bb952f377b41965bf132b6a075be Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - GoogleAppMeasurement: 6cf307834da065863f9faf4c0de0a936d81dd832 + GoogleAppMeasurement: d0560d915abf15e692e8538ba1d58442217b6aff + GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab + GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988 GoogleSignIn: 3a51b9bb8e48b635fd7f4272cee06ca260345b86 - GoogleUtilities: 1e25823cbf46540b4284f6ef8e17b3a68ee12bbc + GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 - nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 + nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701 + PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6 RCTRequired: f63dd90a89a60602acdd44c42e5d2645ca60ab79 RCTTypeSafety: 24a3c6d55684046ed550b1d0ef083a9bf71c8bd4 React: 71c5a51135f291c3b32c0b558e167b858ae50e84 @@ -553,6 +584,6 @@ SPEC CHECKSUMS: RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42 Yoga: 7b4209fda2441f99d54dd6cf4c82b094409bb68f -PODFILE CHECKSUM: 0fdfa45ae809c9460c80be3e0d4bbb822fccc418 +PODFILE CHECKSUM: f615794fb9184757b00cd16e534824ba6ee2fc98 COCOAPODS: 1.8.4 diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 711998a65..3b8158608 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -293,7 +293,7 @@ B35383AD1DDA0083008F406A /* Adjust embedded framework architectures */, 0BB7DA181EC9E695007AAE98 /* Adjust ATS */, DEF4813D224925A2002AD03A /* Copy Google Plist file */, - DEC2069321CBBD6900072F03 /* Setup Fabric */, + DEC2069321CBBD6900072F03 /* Setup Crashlytics */, DE11877A21EE09640078D059 /* Setup Google reverse URL handler */, DE4F6D6E22005C0400DE699E /* Setup Dropbox */, 0BEA5C491F7B8F73000D0AB4 /* Embed Watch Content */, @@ -492,7 +492,7 @@ shellPath = /bin/sh; shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nDROPBOX_KEY_FILE=\"$PROJECT_DIR/dropbox.key\"\n\nif [[ -f $DROPBOX_KEY_FILE ]]; then\n /usr/libexec/PlistBuddy -c \"Delete :LSApplicationQueriesSchemes\" $INFO_PLIST\n /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes array\" $INFO_PLIST\n /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:0 string 'dbapi-2'\" $INFO_PLIST\n /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:1 string 'dbapi-8-emm'\" $INFO_PLIST\n\n DROPBOX_KEY=$(head -n 1 $DROPBOX_KEY_FILE)\n /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLName string dropbox\" $INFO_PLIST\n /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes array\" $INFO_PLIST\n /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes:0 string $DROPBOX_KEY\" $INFO_PLIST\nfi\n"; }; - DEC2069321CBBD6900072F03 /* Setup Fabric */ = { + DEC2069321CBBD6900072F03 /* Setup Crashlytics */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -501,14 +501,14 @@ ); inputPaths = ( ); - name = "Setup Fabric"; + name = "Setup Crashlytics"; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "${PODS_ROOT}/Fabric/run\n"; + shellScript = "GOOGLE_PLIST=\"$PROJECT_DIR/GoogleService-Info.plist\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n if [ \"${CONFIGURATION}\" != \"Debug\" ]; then\n find \"${DWARF_DSYM_FOLDER_PATH}\" -name \"*.dSYM\" | xargs -I \\{\\} ${PODS_ROOT}/Fabric/upload-symbols -gsp $GOOGLE_PLIST -p ios \\{\\}\n fi\nfi\n"; }; DEF4813D224925A2002AD03A /* Copy Google Plist file */ = { isa = PBXShellScriptBuildPhase;