Skip to content

Commit 3cd01ff

Browse files
kpgalligankpgalligan
authored
Merge pull request #7 from Thomas-Vos/crashlytics_update
Update to the new Firebase Crashlytics
2 parents 52dbc41 + 5da68e0 commit 3cd01ff

File tree

4 files changed

+85
-90
lines changed

4 files changed

+85
-90
lines changed

‎sample/iosAppCrashlytics/Podfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ platform :ios, '9.0'
44

55
target 'iosApp' do
66
pod 'sample', :path => '..'
7-
pod 'Fabric'
8-
pod 'Crashlytics'
7+
pod 'Firebase/Crashlytics'
98
pod 'Firebase/Analytics'
109
end

‎sample/iosAppCrashlytics/Podfile.lock‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,115 @@
11
PODS:
2-
- Crashlytics (3.13.4):
3-
- Fabric (~> 1.10.2)
4-
- Fabric (1.10.2)
5-
- Firebase/Analytics (6.6.0):
2+
- Firebase/Analytics (6.33.0):
63
- Firebase/Core
7-
- Firebase/Core (6.6.0):
4+
- Firebase/Core (6.33.0):
85
- Firebase/CoreOnly
9-
- FirebaseAnalytics (= 6.1.0)
10-
- Firebase/CoreOnly (6.6.0):
11-
- FirebaseCore (= 6.2.0)
12-
- FirebaseAnalytics (6.1.0):
13-
- FirebaseCore (~> 6.2)
14-
- FirebaseInstanceID (~> 4.2)
15-
- GoogleAppMeasurement (= 6.1.0)
16-
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
17-
- GoogleUtilities/MethodSwizzler (~> 6.0)
18-
- GoogleUtilities/Network (~> 6.0)
19-
- "GoogleUtilities/NSData+zlib (~> 6.0)"
20-
- nanopb (~> 0.3)
21-
- FirebaseCore (6.2.0):
22-
- FirebaseCoreDiagnostics (~> 1.0)
23-
- FirebaseCoreDiagnosticsInterop (~> 1.0)
24-
- GoogleUtilities/Environment (~> 6.2)
25-
- GoogleUtilities/Logger (~> 6.2)
26-
- FirebaseCoreDiagnostics (1.0.1):
27-
- FirebaseCoreDiagnosticsInterop (~> 1.0)
28-
- GoogleDataTransportCCTSupport (~> 1.0)
29-
- GoogleUtilities/Environment (~> 6.2)
30-
- GoogleUtilities/Logger (~> 6.2)
31-
- FirebaseCoreDiagnosticsInterop (1.0.0)
32-
- FirebaseInstanceID (4.2.3):
33-
- FirebaseCore (~> 6.0)
34-
- GoogleUtilities/Environment (~> 6.0)
35-
- GoogleUtilities/UserDefaults (~> 6.0)
36-
- GoogleAppMeasurement (6.1.0):
37-
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
38-
- GoogleUtilities/MethodSwizzler (~> 6.0)
39-
- GoogleUtilities/Network (~> 6.0)
40-
- "GoogleUtilities/NSData+zlib (~> 6.0)"
41-
- nanopb (~> 0.3)
42-
- GoogleDataTransport (1.1.1)
43-
- GoogleDataTransportCCTSupport (1.0.1):
44-
- GoogleDataTransport (~> 1.1)
45-
- nanopb
46-
- GoogleUtilities/AppDelegateSwizzler (6.2.5):
6+
- FirebaseAnalytics (= 6.8.3)
7+
- Firebase/CoreOnly (6.33.0):
8+
- FirebaseCore (= 6.10.3)
9+
- Firebase/Crashlytics (6.33.0):
10+
- Firebase/CoreOnly
11+
- FirebaseCrashlytics (~> 4.6.1)
12+
- FirebaseAnalytics (6.8.3):
13+
- FirebaseCore (~> 6.10)
14+
- FirebaseInstallations (~> 1.6)
15+
- GoogleAppMeasurement (= 6.8.3)
16+
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
17+
- GoogleUtilities/MethodSwizzler (~> 6.7)
18+
- GoogleUtilities/Network (~> 6.7)
19+
- "GoogleUtilities/NSData+zlib (~> 6.7)"
20+
- nanopb (~> 1.30906.0)
21+
- FirebaseCore (6.10.3):
22+
- FirebaseCoreDiagnostics (~> 1.6)
23+
- GoogleUtilities/Environment (~> 6.7)
24+
- GoogleUtilities/Logger (~> 6.7)
25+
- FirebaseCoreDiagnostics (1.7.0):
26+
- GoogleDataTransport (~> 7.4)
27+
- GoogleUtilities/Environment (~> 6.7)
28+
- GoogleUtilities/Logger (~> 6.7)
29+
- nanopb (~> 1.30906.0)
30+
- FirebaseCrashlytics (4.6.1):
31+
- FirebaseCore (~> 6.10)
32+
- FirebaseInstallations (~> 1.6)
33+
- GoogleDataTransport (~> 7.2)
34+
- nanopb (~> 1.30906.0)
35+
- PromisesObjC (~> 1.2)
36+
- FirebaseInstallations (1.7.0):
37+
- FirebaseCore (~> 6.10)
38+
- GoogleUtilities/Environment (~> 6.7)
39+
- GoogleUtilities/UserDefaults (~> 6.7)
40+
- PromisesObjC (~> 1.2)
41+
- GoogleAppMeasurement (6.8.3):
42+
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
43+
- GoogleUtilities/MethodSwizzler (~> 6.7)
44+
- GoogleUtilities/Network (~> 6.7)
45+
- "GoogleUtilities/NSData+zlib (~> 6.7)"
46+
- nanopb (~> 1.30906.0)
47+
- GoogleDataTransport (7.4.0):
48+
- nanopb (~> 1.30906.0)
49+
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
4750
- GoogleUtilities/Environment
4851
- GoogleUtilities/Logger
4952
- GoogleUtilities/Network
50-
- GoogleUtilities/Environment (6.2.5)
51-
- GoogleUtilities/Logger (6.2.5):
53+
- GoogleUtilities/Environment (6.7.2):
54+
- PromisesObjC (~> 1.2)
55+
- GoogleUtilities/Logger (6.7.2):
5256
- GoogleUtilities/Environment
53-
- GoogleUtilities/MethodSwizzler (6.2.5):
57+
- GoogleUtilities/MethodSwizzler (6.7.2):
5458
- GoogleUtilities/Logger
55-
- GoogleUtilities/Network (6.2.5):
59+
- GoogleUtilities/Network (6.7.2):
5660
- GoogleUtilities/Logger
5761
- "GoogleUtilities/NSData+zlib"
5862
- GoogleUtilities/Reachability
59-
- "GoogleUtilities/NSData+zlib (6.2.5)"
60-
- GoogleUtilities/Reachability (6.2.5):
63+
- "GoogleUtilities/NSData+zlib (6.7.2)"
64+
- GoogleUtilities/Reachability (6.7.2):
6165
- GoogleUtilities/Logger
62-
- GoogleUtilities/UserDefaults (6.2.5):
66+
- GoogleUtilities/UserDefaults (6.7.2):
6367
- GoogleUtilities/Logger
64-
- nanopb (0.3.901):
65-
- nanopb/decode (= 0.3.901)
66-
- nanopb/encode (= 0.3.901)
67-
- nanopb/decode (0.3.901)
68-
- nanopb/encode (0.3.901)
68+
- nanopb (1.30906.0):
69+
- nanopb/decode (= 1.30906.0)
70+
- nanopb/encode (= 1.30906.0)
71+
- nanopb/decode (1.30906.0)
72+
- nanopb/encode (1.30906.0)
73+
- PromisesObjC (1.2.10)
6974
- sample (0.0.1)
7075

7176
DEPENDENCIES:
72-
- Crashlytics
73-
- Fabric
7477
- Firebase/Analytics
78+
- Firebase/Crashlytics
7579
- sample (from `..`)
7680

7781
SPEC REPOS:
78-
https://github.com/CocoaPods/Specs.git:
79-
- Crashlytics
80-
- Fabric
82+
trunk:
8183
- Firebase
8284
- FirebaseAnalytics
8385
- FirebaseCore
8486
- FirebaseCoreDiagnostics
85-
- FirebaseCoreDiagnosticsInterop
86-
- FirebaseInstanceID
87+
- FirebaseCrashlytics
88+
- FirebaseInstallations
8789
- GoogleAppMeasurement
8890
- GoogleDataTransport
89-
- GoogleDataTransportCCTSupport
9091
- GoogleUtilities
9192
- nanopb
93+
- PromisesObjC
9294

9395
EXTERNAL SOURCES:
9496
sample:
9597
:path: ".."
9698

9799
SPEC CHECKSUMS:
98-
Crashlytics: 2dfd686bcb918dc10ee0e76f7f853fe42c7bd552
99-
Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
100-
Firebase: a2b5951f30ff38fd3b3bdae9c7d340f940fd3c51
101-
FirebaseAnalytics: 48414ae5cbf6976d8a2f7177e0466540e5ab33ce
102-
FirebaseCore: 8c9e08bce0c72a3affd83927d8184cf244918bc8
103-
FirebaseCoreDiagnostics: 4c04ae09d0ab027c30179828c6bb47764df1bd13
104-
FirebaseCoreDiagnosticsInterop: 6829da2b8d1fc795ff1bd99df751d3788035d2cb
105-
FirebaseInstanceID: 8b42755db950682e7de0d167bc6fb26a57b244af
106-
GoogleAppMeasurement: 47285fa897e5a125df56b9ef8750a1d81e4598a8
107-
GoogleDataTransport: ffbadce4ab93c88fb9dd8e6366c47bfcb4a32193
108-
GoogleDataTransportCCTSupport: 3451e7d8ba19093e533362a6d78d6d9014c6a037
109-
GoogleUtilities: e7dc37039b19df7fe543479d3e4a02ac8d11bb69
110-
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
100+
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
101+
FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
102+
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
103+
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
104+
FirebaseCrashlytics: 5777d3462fb8c3ab9e80a2473bd7d667a2e8411c
105+
FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
106+
GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
107+
GoogleDataTransport: b7f406340a291370045a270c599e53c6fa6ec20f
108+
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
109+
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
110+
PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151
111111
sample: f10dc27f2389c787c238faa243d44f45b54abf6b
112112

113-
PODFILE CHECKSUM: ee0e4ee727fca598ce95d3f92331cd477e61e6d3
113+
PODFILE CHECKSUM: 429c8ae0eb9c8a45ebd3742d72d6214fa956ad2c
114114

115-
COCOAPODS: 1.9.2
115+
COCOAPODS: 1.9.3

‎sample/iosAppCrashlytics/iosApp.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
);
232232
runOnlyForDeploymentPostprocessing = 0;
233233
shellPath = /bin/sh;
234-
shellScript = "\"${PODS_ROOT}/Fabric/run\"\n";
234+
shellScript = "\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n";
235235
};
236236
/* End PBXShellScriptBuildPhase section */
237237

‎sample/iosAppCrashlytics/iosApp/CrashNSException.swift‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,17 @@
88

99
import Foundation
1010
import sample
11-
import Crashlytics
11+
import FirebaseCrashlytics
1212

1313
class CrashlyticsCrashHandler: CrashkiosCrashHandler {
1414
override func crashParts(
1515
addresses: [KotlinLong],
1616
exceptionType: String,
1717
message: String) {
18-
let clsStackTrace = addresses.map {
19-
CLSStackFrame(address: UInt(truncating: $0))
18+
let exceptionModel = ExceptionModel(name: exceptionType, reason: message)
19+
exceptionModel.stackTrace = addresses.map {
20+
StackFrame(address: UInt(truncating: $0))
2021
}
21-
22-
Crashlytics.sharedInstance().recordCustomExceptionName(
23-
exceptionType,
24-
reason: message,
25-
frameArray: clsStackTrace
26-
)
22+
Crashlytics.crashlytics().record(exceptionModel: exceptionModel)
2723
}
2824
}

0 commit comments

Comments
 (0)