diff --git a/ios/Podfile b/ios/Podfile
index 9483d129d..9df4e795c 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -5,10 +5,8 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
target 'jitsi-meet' do
project 'app/app.xcodeproj'
- pod 'Crashlytics', '~> 3.14.0'
- pod 'Fabric', '~> 1.10.2'
- pod 'Firebase/Core', '~> 6.16.0'
- pod 'Firebase/DynamicLinks', '~> 6.16.0'
+ pod 'Firebase/Crashlytics', '~> 6.24.0'
+ pod 'Firebase/DynamicLinks', '~> 6.24.0'
end
target 'JitsiMeet' do
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 3074997bc..89cbb8b12 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -11,10 +11,7 @@ PODS:
- CocoaLumberjack (3.5.3):
- CocoaLumberjack/Core (= 3.5.3)
- CocoaLumberjack/Core (3.5.3)
- - Crashlytics (3.14.0):
- - Fabric (~> 1.10.2)
- DoubleConversion (1.1.6)
- - Fabric (1.10.2)
- FBLazyVector (0.61.5-jitsi.1)
- FBReactNativeSpec (0.61.5-jitsi.1):
- Folly (= 2018.10.22.00)
@@ -23,48 +20,43 @@ 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 (6.16.0):
+ - Firebase/CoreOnly (6.24.0):
+ - FirebaseCore (= 6.7.0)
+ - Firebase/Crashlytics (6.24.0):
- Firebase/CoreOnly
- - FirebaseAnalytics (= 6.2.2)
- - Firebase/CoreOnly (6.16.0):
- - FirebaseCore (= 6.6.1)
- - Firebase/DynamicLinks (6.16.0):
+ - FirebaseCrashlytics (~> 4.1.0)
+ - Firebase/DynamicLinks (6.24.0):
- Firebase/CoreOnly
- - 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)
+ - FirebaseDynamicLinks (~> 4.0.8)
- FirebaseAnalyticsInterop (1.5.0)
- - FirebaseCore (6.6.1):
- - FirebaseCoreDiagnostics (~> 1.2)
+ - FirebaseCore (6.7.0):
+ - FirebaseCoreDiagnostics (~> 1.3)
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- - FirebaseCoreDiagnostics (1.2.2):
+ - FirebaseCoreDiagnostics (1.3.0):
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- - GoogleDataTransportCCTSupport (~> 2.0)
+ - GoogleDataTransportCCTSupport (~> 3.1)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- - nanopb (~> 0.3.901)
+ - nanopb (~> 1.30905.0)
- FirebaseCoreDiagnosticsInterop (1.2.0)
+ - FirebaseCrashlytics (4.1.1):
+ - FirebaseAnalyticsInterop (~> 1.2)
+ - FirebaseCore (~> 6.6)
+ - FirebaseInstallations (~> 1.1)
+ - GoogleDataTransport (~> 6.1)
+ - GoogleDataTransportCCTSupport (~> 3.1)
+ - nanopb (~> 1.30905.0)
+ - PromisesObjC (~> 1.2)
- FirebaseDynamicLinks (4.0.8):
- FirebaseAnalyticsInterop (~> 1.3)
- FirebaseCore (~> 6.2)
- - FirebaseInstallations (1.1.1):
+ - FirebaseInstallations (1.2.0):
- FirebaseCore (~> 6.6)
- - GoogleUtilities/UserDefaults (~> 6.5)
+ - GoogleUtilities/Environment (~> 6.6)
+ - GoogleUtilities/UserDefaults (~> 6.6)
- 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
@@ -75,37 +67,19 @@ PODS:
- DoubleConversion
- glog
- glog (0.3.5)
- - 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)
+ - GoogleDataTransport (6.1.0)
+ - GoogleDataTransportCCTSupport (3.1.0):
+ - GoogleDataTransport (~> 6.1)
+ - nanopb (~> 1.30905.0)
- GoogleSignIn (5.0.1):
- AppAuth (~> 1.2)
- GTMAppAuth (~> 1.0)
- GTMSessionFetcher/Core (~> 1.1)
- - GoogleUtilities/AppDelegateSwizzler (6.5.2):
+ - GoogleUtilities/Environment (6.6.0):
+ - PromisesObjC (~> 1.2)
+ - GoogleUtilities/Logger (6.6.0):
- GoogleUtilities/Environment
- - GoogleUtilities/Logger
- - GoogleUtilities/Network
- - GoogleUtilities/Environment (6.5.2)
- - GoogleUtilities/Logger (6.5.2):
- - GoogleUtilities/Environment
- - GoogleUtilities/MethodSwizzler (6.5.2):
- - GoogleUtilities/Logger
- - GoogleUtilities/Network (6.5.2):
- - GoogleUtilities/Logger
- - "GoogleUtilities/NSData+zlib"
- - GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (6.5.2)"
- - GoogleUtilities/Reachability (6.5.2):
- - GoogleUtilities/Logger
- - GoogleUtilities/UserDefaults (6.5.2):
+ - GoogleUtilities/UserDefaults (6.6.0):
- GoogleUtilities/Logger
- GTMAppAuth (1.0.0):
- AppAuth/Core (~> 1.0)
@@ -115,11 +89,11 @@ PODS:
- GTMSessionFetcher/Core (1.2.2)
- GTMSessionFetcher/Full (1.2.2):
- GTMSessionFetcher/Core (= 1.2.2)
- - nanopb (0.3.9011):
- - nanopb/decode (= 0.3.9011)
- - nanopb/encode (= 0.3.9011)
- - nanopb/decode (0.3.9011)
- - nanopb/encode (0.3.9011)
+ - nanopb (1.30905.0):
+ - nanopb/decode (= 1.30905.0)
+ - nanopb/encode (= 1.30905.0)
+ - nanopb/decode (1.30905.0)
+ - nanopb/encode (1.30905.0)
- ObjectiveDropboxOfficial (3.9.4)
- PromisesObjC (1.2.8)
- RCTRequired (0.61.5-jitsi.1)
@@ -373,13 +347,11 @@ DEPENDENCIES:
- Amplitude-iOS (~> 4.0.4)
- BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
- CocoaLumberjack (~> 3.5.3)
- - Crashlytics (~> 3.14.0)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- - Fabric (~> 1.10.2)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`)
- - Firebase/Core (~> 6.16.0)
- - Firebase/DynamicLinks (~> 6.16.0)
+ - Firebase/Crashlytics (~> 6.24.0)
+ - Firebase/DynamicLinks (~> 6.24.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)
@@ -424,18 +396,14 @@ SPEC REPOS:
- AppAuth
- boost-for-react-native
- CocoaLumberjack
- - Crashlytics
- - Fabric
- Firebase
- - FirebaseAnalytics
- FirebaseAnalyticsInterop
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseCoreDiagnosticsInterop
+ - FirebaseCrashlytics
- FirebaseDynamicLinks
- FirebaseInstallations
- - FirebaseInstanceID
- - GoogleAppMeasurement
- GoogleDataTransport
- GoogleDataTransportCCTSupport
- GoogleSignIn
@@ -530,30 +498,26 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
- Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
- Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
FBLazyVector: 4a5251159a3ed05dc11cc8b74cf937869935814b
FBReactNativeSpec: 6fa602a20993212cc9877a81838578ffb0008bc9
- Firebase: 497158b816d0a86fc31babbd05546fcd7e6083ff
- FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee
+ Firebase: b28e55c60efd98963cd9011fe2fac5a10c2ba124
FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
- FirebaseCore: 85064903ed6c28e47fec9c7bd149d94ba1b6b6e7
- FirebaseCoreDiagnostics: e9b4cd8ba60dee0f2d13347332e4b7898cca5b61
+ FirebaseCore: e610482f64097b0e9f056cd97bc6b33dfabcbb6a
+ FirebaseCoreDiagnostics: 4a773a47bd83bbd5a9b1ccf1ce7caa8b2d535e67
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
+ FirebaseCrashlytics: a87cce5746d3335995bd18b1b60d073cd05a6920
FirebaseDynamicLinks: 417dc6dbb6013233c77558290d73296f429656a6
- FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44
- FirebaseInstanceID: 7ee0d6777013bb952f377b41965bf132b6a075be
+ FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
- GoogleAppMeasurement: d0560d915abf15e692e8538ba1d58442217b6aff
- GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab
- GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988
+ GoogleDataTransport: f6f8eba931df03ebd2232ff4645aa85f8f47b5ab
+ GoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3d
GoogleSignIn: 3a51b9bb8e48b635fd7f4272cee06ca260345b86
- GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e
+ GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e
GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
- nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
+ nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
RCTRequired: f63dd90a89a60602acdd44c42e5d2645ca60ab79
@@ -589,6 +553,6 @@ SPEC CHECKSUMS:
RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
Yoga: 7b4209fda2441f99d54dd6cf4c82b094409bb68f
-PODFILE CHECKSUM: 082858daebbe170e7a490de433e7f2a99e0c3701
+PODFILE CHECKSUM: 7255ec38ea51a8bc10a7a582248b4eb4bbbff80c
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3
diff --git a/ios/app/src/AppDelegate.m b/ios/app/src/AppDelegate.m
index 3a4395a7d..dddfedebd 100644
--- a/ios/app/src/AppDelegate.m
+++ b/ios/app/src/AppDelegate.m
@@ -20,8 +20,6 @@
#import "Types.h"
#import "ViewController.h"
-@import Crashlytics;
-@import Fabric;
@import Firebase;
@import JitsiMeet;
@@ -48,10 +46,11 @@
}];
// Initialize Crashlytics and Firebase if a valid GoogleService-Info.plist file was provided.
- if ([FIRUtilities appContainsRealServiceInfoPlist] && ![jitsiMeet isCrashReportingDisabled]) {
- NSLog(@"Enabling Crashlytics and Firebase");
+ if ([FIRUtilities appContainsRealServiceInfoPlist]) {
+ NSLog(@"Enabling Firebase");
[FIRApp configure];
- [Fabric with:@[[Crashlytics class]]];
+ // Crashlytics defaults to disabled wirth the FirebaseCrashlyticsCollectionEnabled Info.plist key.
+ [[FIRCrashlytics crashlytics] setCrashlyticsCollectionEnabled:![jitsiMeet isCrashReportingDisabled]];
}
[jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];
diff --git a/ios/app/src/Info.plist b/ios/app/src/Info.plist
index 3bd1c3c61..95e255988 100644
--- a/ios/app/src/Info.plist
+++ b/ios/app/src/Info.plist
@@ -99,7 +99,7 @@
UIViewControllerBasedStatusBarAppearance
- firebase_crashlytics_collection_enabled
+ FirebaseCrashlyticsCollectionEnabled
false