浏览代码

ios: update Crashlytics dependency

master
Saúl Ibarra Corretgé 5 年前
父节点
当前提交
312949eef6
共有 4 个文件被更改,包括 56 次插入95 次删除
  1. 2
    4
      ios/Podfile
  2. 49
    85
      ios/Podfile.lock
  3. 4
    5
      ios/app/src/AppDelegate.m
  4. 1
    1
      ios/app/src/Info.plist

+ 2
- 4
ios/Podfile 查看文件

@@ -5,10 +5,8 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
5 5
 target 'jitsi-meet' do
6 6
   project 'app/app.xcodeproj'
7 7
 
8
-  pod 'Crashlytics', '~> 3.14.0'
9
-  pod 'Fabric', '~> 1.10.2'
10
-  pod 'Firebase/Core', '~> 6.16.0'
11
-  pod 'Firebase/DynamicLinks', '~> 6.16.0'
8
+  pod 'Firebase/Crashlytics', '~> 6.24.0'
9
+  pod 'Firebase/DynamicLinks', '~> 6.24.0'
12 10
 end
13 11
 
14 12
 target 'JitsiMeet' do

+ 49
- 85
ios/Podfile.lock 查看文件

@@ -11,10 +11,7 @@ PODS:
11 11
   - CocoaLumberjack (3.5.3):
12 12
     - CocoaLumberjack/Core (= 3.5.3)
13 13
   - CocoaLumberjack/Core (3.5.3)
14
-  - Crashlytics (3.14.0):
15
-    - Fabric (~> 1.10.2)
16 14
   - DoubleConversion (1.1.6)
17
-  - Fabric (1.10.2)
18 15
   - FBLazyVector (0.61.5-jitsi.1)
19 16
   - FBReactNativeSpec (0.61.5-jitsi.1):
20 17
     - Folly (= 2018.10.22.00)
@@ -23,48 +20,43 @@ PODS:
23 20
     - React-Core (= 0.61.5-jitsi.1)
24 21
     - React-jsi (= 0.61.5-jitsi.1)
25 22
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1)
26
-  - Firebase/Core (6.16.0):
23
+  - Firebase/CoreOnly (6.24.0):
24
+    - FirebaseCore (= 6.7.0)
25
+  - Firebase/Crashlytics (6.24.0):
27 26
     - Firebase/CoreOnly
28
-    - FirebaseAnalytics (= 6.2.2)
29
-  - Firebase/CoreOnly (6.16.0):
30
-    - FirebaseCore (= 6.6.1)
31
-  - Firebase/DynamicLinks (6.16.0):
27
+    - FirebaseCrashlytics (~> 4.1.0)
28
+  - Firebase/DynamicLinks (6.24.0):
32 29
     - Firebase/CoreOnly
33
-    - FirebaseDynamicLinks (~> 4.0.6)
34
-  - FirebaseAnalytics (6.2.2):
35
-    - FirebaseCore (~> 6.6)
36
-    - FirebaseInstanceID (~> 4.3)
37
-    - GoogleAppMeasurement (= 6.2.2)
38
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
39
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
40
-    - GoogleUtilities/Network (~> 6.0)
41
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
42
-    - nanopb (= 0.3.9011)
30
+    - FirebaseDynamicLinks (~> 4.0.8)
43 31
   - FirebaseAnalyticsInterop (1.5.0)
44
-  - FirebaseCore (6.6.1):
45
-    - FirebaseCoreDiagnostics (~> 1.2)
32
+  - FirebaseCore (6.7.0):
33
+    - FirebaseCoreDiagnostics (~> 1.3)
46 34
     - FirebaseCoreDiagnosticsInterop (~> 1.2)
47 35
     - GoogleUtilities/Environment (~> 6.5)
48 36
     - GoogleUtilities/Logger (~> 6.5)
49
-  - FirebaseCoreDiagnostics (1.2.2):
37
+  - FirebaseCoreDiagnostics (1.3.0):
50 38
     - FirebaseCoreDiagnosticsInterop (~> 1.2)
51
-    - GoogleDataTransportCCTSupport (~> 2.0)
39
+    - GoogleDataTransportCCTSupport (~> 3.1)
52 40
     - GoogleUtilities/Environment (~> 6.5)
53 41
     - GoogleUtilities/Logger (~> 6.5)
54
-    - nanopb (~> 0.3.901)
42
+    - nanopb (~> 1.30905.0)
55 43
   - FirebaseCoreDiagnosticsInterop (1.2.0)
44
+  - FirebaseCrashlytics (4.1.1):
45
+    - FirebaseAnalyticsInterop (~> 1.2)
46
+    - FirebaseCore (~> 6.6)
47
+    - FirebaseInstallations (~> 1.1)
48
+    - GoogleDataTransport (~> 6.1)
49
+    - GoogleDataTransportCCTSupport (~> 3.1)
50
+    - nanopb (~> 1.30905.0)
51
+    - PromisesObjC (~> 1.2)
56 52
   - FirebaseDynamicLinks (4.0.8):
57 53
     - FirebaseAnalyticsInterop (~> 1.3)
58 54
     - FirebaseCore (~> 6.2)
59
-  - FirebaseInstallations (1.1.1):
55
+  - FirebaseInstallations (1.2.0):
60 56
     - FirebaseCore (~> 6.6)
61
-    - GoogleUtilities/UserDefaults (~> 6.5)
57
+    - GoogleUtilities/Environment (~> 6.6)
58
+    - GoogleUtilities/UserDefaults (~> 6.6)
62 59
     - PromisesObjC (~> 1.2)
63
-  - FirebaseInstanceID (4.3.2):
64
-    - FirebaseCore (~> 6.6)
65
-    - FirebaseInstallations (~> 1.0)
66
-    - GoogleUtilities/Environment (~> 6.5)
67
-    - GoogleUtilities/UserDefaults (~> 6.5)
68 60
   - Folly (2018.10.22.00):
69 61
     - boost-for-react-native
70 62
     - DoubleConversion
@@ -75,37 +67,19 @@ PODS:
75 67
     - DoubleConversion
76 68
     - glog
77 69
   - glog (0.3.5)
78
-  - GoogleAppMeasurement (6.2.2):
79
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
80
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
81
-    - GoogleUtilities/Network (~> 6.0)
82
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
83
-    - nanopb (= 0.3.9011)
84
-  - GoogleDataTransport (5.1.0)
85
-  - GoogleDataTransportCCTSupport (2.0.1):
86
-    - GoogleDataTransport (~> 5.1)
87
-    - nanopb (~> 0.3.901)
70
+  - GoogleDataTransport (6.1.0)
71
+  - GoogleDataTransportCCTSupport (3.1.0):
72
+    - GoogleDataTransport (~> 6.1)
73
+    - nanopb (~> 1.30905.0)
88 74
   - GoogleSignIn (5.0.1):
89 75
     - AppAuth (~> 1.2)
90 76
     - GTMAppAuth (~> 1.0)
91 77
     - GTMSessionFetcher/Core (~> 1.1)
92
-  - GoogleUtilities/AppDelegateSwizzler (6.5.2):
93
-    - GoogleUtilities/Environment
94
-    - GoogleUtilities/Logger
95
-    - GoogleUtilities/Network
96
-  - GoogleUtilities/Environment (6.5.2)
97
-  - GoogleUtilities/Logger (6.5.2):
78
+  - GoogleUtilities/Environment (6.6.0):
79
+    - PromisesObjC (~> 1.2)
80
+  - GoogleUtilities/Logger (6.6.0):
98 81
     - GoogleUtilities/Environment
99
-  - GoogleUtilities/MethodSwizzler (6.5.2):
100
-    - GoogleUtilities/Logger
101
-  - GoogleUtilities/Network (6.5.2):
102
-    - GoogleUtilities/Logger
103
-    - "GoogleUtilities/NSData+zlib"
104
-    - GoogleUtilities/Reachability
105
-  - "GoogleUtilities/NSData+zlib (6.5.2)"
106
-  - GoogleUtilities/Reachability (6.5.2):
107
-    - GoogleUtilities/Logger
108
-  - GoogleUtilities/UserDefaults (6.5.2):
82
+  - GoogleUtilities/UserDefaults (6.6.0):
109 83
     - GoogleUtilities/Logger
110 84
   - GTMAppAuth (1.0.0):
111 85
     - AppAuth/Core (~> 1.0)
@@ -115,11 +89,11 @@ PODS:
115 89
   - GTMSessionFetcher/Core (1.2.2)
116 90
   - GTMSessionFetcher/Full (1.2.2):
117 91
     - GTMSessionFetcher/Core (= 1.2.2)
118
-  - nanopb (0.3.9011):
119
-    - nanopb/decode (= 0.3.9011)
120
-    - nanopb/encode (= 0.3.9011)
121
-  - nanopb/decode (0.3.9011)
122
-  - nanopb/encode (0.3.9011)
92
+  - nanopb (1.30905.0):
93
+    - nanopb/decode (= 1.30905.0)
94
+    - nanopb/encode (= 1.30905.0)
95
+  - nanopb/decode (1.30905.0)
96
+  - nanopb/encode (1.30905.0)
123 97
   - ObjectiveDropboxOfficial (3.9.4)
124 98
   - PromisesObjC (1.2.8)
125 99
   - RCTRequired (0.61.5-jitsi.1)
@@ -373,13 +347,11 @@ DEPENDENCIES:
373 347
   - Amplitude-iOS (~> 4.0.4)
374 348
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
375 349
   - CocoaLumberjack (~> 3.5.3)
376
-  - Crashlytics (~> 3.14.0)
377 350
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
378
-  - Fabric (~> 1.10.2)
379 351
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
380 352
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`)
381
-  - Firebase/Core (~> 6.16.0)
382
-  - Firebase/DynamicLinks (~> 6.16.0)
353
+  - Firebase/Crashlytics (~> 6.24.0)
354
+  - Firebase/DynamicLinks (~> 6.24.0)
383 355
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
384 356
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
385 357
   - ObjectiveDropboxOfficial (~> 3.9.4)
@@ -424,18 +396,14 @@ SPEC REPOS:
424 396
     - AppAuth
425 397
     - boost-for-react-native
426 398
     - CocoaLumberjack
427
-    - Crashlytics
428
-    - Fabric
429 399
     - Firebase
430
-    - FirebaseAnalytics
431 400
     - FirebaseAnalyticsInterop
432 401
     - FirebaseCore
433 402
     - FirebaseCoreDiagnostics
434 403
     - FirebaseCoreDiagnosticsInterop
404
+    - FirebaseCrashlytics
435 405
     - FirebaseDynamicLinks
436 406
     - FirebaseInstallations
437
-    - FirebaseInstanceID
438
-    - GoogleAppMeasurement
439 407
     - GoogleDataTransport
440 408
     - GoogleDataTransportCCTSupport
441 409
     - GoogleSignIn
@@ -530,30 +498,26 @@ SPEC CHECKSUMS:
530 498
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
531 499
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
532 500
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
533
-  Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
534 501
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
535
-  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
536 502
   FBLazyVector: 4a5251159a3ed05dc11cc8b74cf937869935814b
537 503
   FBReactNativeSpec: 6fa602a20993212cc9877a81838578ffb0008bc9
538
-  Firebase: 497158b816d0a86fc31babbd05546fcd7e6083ff
539
-  FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee
504
+  Firebase: b28e55c60efd98963cd9011fe2fac5a10c2ba124
540 505
   FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
541
-  FirebaseCore: 85064903ed6c28e47fec9c7bd149d94ba1b6b6e7
542
-  FirebaseCoreDiagnostics: e9b4cd8ba60dee0f2d13347332e4b7898cca5b61
506
+  FirebaseCore: e610482f64097b0e9f056cd97bc6b33dfabcbb6a
507
+  FirebaseCoreDiagnostics: 4a773a47bd83bbd5a9b1ccf1ce7caa8b2d535e67
543 508
   FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
509
+  FirebaseCrashlytics: a87cce5746d3335995bd18b1b60d073cd05a6920
544 510
   FirebaseDynamicLinks: 417dc6dbb6013233c77558290d73296f429656a6
545
-  FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44
546
-  FirebaseInstanceID: 7ee0d6777013bb952f377b41965bf132b6a075be
511
+  FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa
547 512
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
548 513
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
549
-  GoogleAppMeasurement: d0560d915abf15e692e8538ba1d58442217b6aff
550
-  GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab
551
-  GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988
514
+  GoogleDataTransport: f6f8eba931df03ebd2232ff4645aa85f8f47b5ab
515
+  GoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3d
552 516
   GoogleSignIn: 3a51b9bb8e48b635fd7f4272cee06ca260345b86
553
-  GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e
517
+  GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
554 518
   GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e
555 519
   GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
556
-  nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
520
+  nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
557 521
   ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
558 522
   PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
559 523
   RCTRequired: f63dd90a89a60602acdd44c42e5d2645ca60ab79
@@ -589,6 +553,6 @@ SPEC CHECKSUMS:
589 553
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
590 554
   Yoga: 7b4209fda2441f99d54dd6cf4c82b094409bb68f
591 555
 
592
-PODFILE CHECKSUM: 082858daebbe170e7a490de433e7f2a99e0c3701
556
+PODFILE CHECKSUM: 7255ec38ea51a8bc10a7a582248b4eb4bbbff80c
593 557
 
594
-COCOAPODS: 1.9.1
558
+COCOAPODS: 1.9.3

+ 4
- 5
ios/app/src/AppDelegate.m 查看文件

@@ -20,8 +20,6 @@
20 20
 #import "Types.h"
21 21
 #import "ViewController.h"
22 22
 
23
-@import Crashlytics;
24
-@import Fabric;
25 23
 @import Firebase;
26 24
 @import JitsiMeet;
27 25
 
@@ -48,10 +46,11 @@
48 46
     }];
49 47
 
50 48
     // Initialize Crashlytics and Firebase if a valid GoogleService-Info.plist file was provided.
51
-    if ([FIRUtilities appContainsRealServiceInfoPlist] && ![jitsiMeet isCrashReportingDisabled]) {
52
-        NSLog(@"Enabling Crashlytics and Firebase");
49
+  if ([FIRUtilities appContainsRealServiceInfoPlist]) {
50
+        NSLog(@"Enabling Firebase");
53 51
         [FIRApp configure];
54
-        [Fabric with:@[[Crashlytics class]]];
52
+        // Crashlytics defaults to disabled wirth the FirebaseCrashlyticsCollectionEnabled Info.plist key.
53
+        [[FIRCrashlytics crashlytics] setCrashlyticsCollectionEnabled:![jitsiMeet isCrashReportingDisabled]];
55 54
     }
56 55
 
57 56
     [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];

+ 1
- 1
ios/app/src/Info.plist 查看文件

@@ -99,7 +99,7 @@
99 99
 	</array>
100 100
 	<key>UIViewControllerBasedStatusBarAppearance</key>
101 101
 	<false/>
102
-	<key>firebase_crashlytics_collection_enabled</key>
102
+	<key>FirebaseCrashlyticsCollectionEnabled</key>
103 103
 	<string>false</string>
104 104
 </dict>
105 105
 </plist>

正在加载...
取消
保存