Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 05186ee

Browse files
committed
remove TNSCrashlyticsLogger wrapper framework
...and upgrade everything to new FirebaseCrashlytics API TODO: manual crashing is currently missing
1 parent 46f990e commit 05186ee

File tree

21 files changed

+415
-769
lines changed

21 files changed

+415
-769
lines changed

publish/scripts/installer.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ function promptQuestionsResult(result) {
253253
writePodFile(result);
254254
writeGoogleServiceCopyHook();
255255
writeBuildscriptHookForCrashlytics(isSelected(result.crashlytics));
256-
activateIOSCrashlyticsFramework(isSelected(result.crashlytics));
257256
activateIOSMLKitCameraFramework(isSelected(result.ml_kit));
258257
}
259258

@@ -319,14 +318,6 @@ function activateIOSMLKitCameraFramework(enable) {
319318
}
320319
}
321320

322-
function activateIOSCrashlyticsFramework(enable) {
323-
if (enable && fs.existsSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework-disabled'))) {
324-
fs.renameSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework-disabled'), path.join(directories.ios, 'TNSCrashlyticsLogger.framework'));
325-
} else if (!enable && fs.existsSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework'))) {
326-
fs.renameSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework'), path.join(directories.ios, 'TNSCrashlyticsLogger.framework-disabled'));
327-
}
328-
}
329-
330321
function askSaveConfigPrompt() {
331322
prompt.get({
332323
name: 'save_config',

src/crashlytics/crashlytics.ios.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,71 +2,71 @@ import { ENABLE_CRASHLYTICS_HINT } from "./crashlytics-common";
22

33
export function sendCrashLog(exception: any /* NSError */): void {
44
if (isCrashlyticsAvailable()) {
5-
Crashlytics.sharedInstance().recordError(exception);
5+
FIRCrashlytics.crashlytics().recordError(exception);
66
}
77
}
88

99
export function log(msg: string, tag?: string, priority?: number): void {
1010
if (isCrashlyticsAvailable()) {
1111
if (tag) {
12-
TNSCrashlyticsLoggerWrapper.log(tag + " - " + msg);
12+
FIRCrashlytics.crashlytics().log(tag + " - " + msg);
1313
} else {
14-
TNSCrashlyticsLoggerWrapper.log(msg);
14+
FIRCrashlytics.crashlytics().log(msg);
1515
}
1616
}
1717
}
1818

1919
export function setString(key: string, value: string): void {
2020
if (isCrashlyticsAvailable()) {
21-
Crashlytics.sharedInstance().setObjectValueForKey(value, key);
21+
FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
2222
}
2323
}
2424

2525
export function setBool(key: string, value: boolean): void {
2626
if (isCrashlyticsAvailable()) {
27-
Crashlytics.sharedInstance().setBoolValueForKey(value, key);
27+
FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
2828
}
2929
}
3030

3131
export function setFloat(key: string, value: number): void {
3232
if (isCrashlyticsAvailable()) {
33-
Crashlytics.sharedInstance().setFloatValueForKey(value, key);
33+
FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
3434
}
3535
}
3636

3737
export function setInt(key: string, value: number): void {
3838
if (isCrashlyticsAvailable()) {
39-
Crashlytics.sharedInstance().setIntValueForKey(value, key);
39+
FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
4040
}
4141
}
4242

4343
export function setDouble(key: string, value: number): void {
4444
if (isCrashlyticsAvailable()) {
45-
Crashlytics.sharedInstance().setFloatValueForKey(value, key);
45+
FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
4646
}
4747
}
4848

4949
export function setUserId(id: string): void {
5050
if (isCrashlyticsAvailable()) {
51-
Crashlytics.sharedInstance().setUserIdentifier(id);
51+
FIRCrashlytics.crashlytics().setUserID(id);
5252
}
5353
}
5454

5555
export function crash(): void {
56-
// if (isCrashlyticsAvailable()) {
57-
// Crashlytics.sharedInstance().crash();
58-
// }
59-
// Fabric.with(NSArray.arrayWithObject(Crashlytics.class()));
56+
if (isCrashlyticsAvailable()) {
57+
// TODO: manually force crash - https://firebase.google.com/docs/crashlytics/test-implementation?authuser=0&platform=ios#force_a_crash_to_test_your_implementation
58+
console.log('currently manual crashing not implemented');
59+
}
6060
}
6161

6262
export function setCrashlyticsCollectionEnabled(enabled: boolean): void {
63-
// if (isCrashlyticsAvailable()) {
64-
// Fabric.with(NSArray.arrayWithObject(Crashlytics.class()));
65-
// }
63+
if (isCrashlyticsAvailable()) {
64+
FIRCrashlytics.crashlytics().setCrashlyticsCollectionEnabled(enabled);
65+
}
6666
}
6767

6868
function isCrashlyticsAvailable(): boolean {
69-
if (typeof (Crashlytics) === "undefined") {
69+
if (typeof (FIRCrashlytics) === "undefined") {
7070
console.log(ENABLE_CRASHLYTICS_HINT);
7171
return false;
7272
}

src/platforms/ios/TNSCrashlyticsLogger.framework-disabled/Headers/TNSCrashlyticsLogger.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/platforms/ios/TNSCrashlyticsLogger.framework-disabled/Headers/TNSCrashlyticsLoggerWrapper.h

Lines changed: 0 additions & 7 deletions
This file was deleted.
-772 Bytes
Binary file not shown.

src/platforms/ios/TNSCrashlyticsLogger.framework-disabled/Modules/module.modulemap

Lines changed: 0 additions & 6 deletions
This file was deleted.
Binary file not shown.

src/platforms/ios/typings/objc!Crashlytics.d.ts

Lines changed: 0 additions & 236 deletions
This file was deleted.

0 commit comments

Comments
 (0)