fix: move to latest SDKs

Author: farfromrefug

.gitignore

@@ -21,3 +21,4 @@ Pods
 *.xcuserdatad
 /plugin/README.md
 pnpm-lock.yaml
+/plugin/platforms/android/sentry.aar

plugin/platforms/android/include.gradle

@@ -7,6 +7,6 @@ android {
     }
 }
 dependencies {
-    def sentryVersion =  project.hasProperty("sentryVersion") ? project.sentryVersion : "4.2.0"
+    def sentryVersion =  project.hasProperty("sentryVersion") ? project.sentryVersion : "5.2.0"
     implementation "io.sentry:sentry-android:$sentryVersion"
 }

plugin/platforms/android/sentry.aar

@@ -1 +1 @@
-pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '6.2.0'
+pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0'

plugin/platforms/ios/Podfile

@@ -0,0 +1,11 @@
+#import <Sentry/Sentry.h>
+
+
+@interface NSSentrySDK: SentrySDK
+
++ (void)captureEnvelope:(SentryEnvelope *)envelope;
+
++ (void)storeEnvelope:(SentryEnvelope *)envelope;
+
+
+@end

plugin/platforms/ios/src/Info.plist

@@ -0,0 +1,5 @@
+#import "NSSentry.h"
+#import <Sentry/Sentry.h>
+
+@implementation NSSentrySDK
+@end

plugin/platforms/ios/src/NSSentry.h

@@ -0,0 +1,4 @@
+module NSSentry {
+    header "NSSentry.h"
+    export *
+}

plugin/platforms/ios/src/NSSentry.m

@@ -35,6 +35,19 @@ export interface NativescriptOptions extends BrowserOptions {
 
     sessionTrackingIntervalMillis?: number;
 
+    /** Enable scope sync from Java to NDK on Android */
+    enableNdkScopeSync?: boolean;
+
+    /** When enabled, all the threads are automatically attached to all logged events on Android */
+    attachThreads?: boolean;
+
+    /**
+     *  When enabled, certain personally identifiable information (PII) is added by active integrations.
+     *
+     * @default false
+     * */
+    sendDefaultPii?: boolean;
+
     /** Should the native nagger alert be shown or not. */
     // enableNativeNagger?: boolean;
     /**
@@ -53,6 +66,11 @@ export interface NativescriptOptions extends BrowserOptions {
         sentry?: boolean;
         xhr?: boolean;
     };
+
+    /** Enable auto performance tracking by default. */
+    enableAutoPerformanceTracking?: boolean;
+
+    flushSendEvent?: boolean;
 }
 
 /** The Sentry Nativescript SDK Backend. */
@@ -65,9 +83,10 @@ export class NativescriptBackend extends BaseBackend<BrowserOptions> {
         this._browserBackend = new BrowserBackend(_options);
 
         if (_options.enableNative !== false) {
-            NSSentry.startWithDsnString(_options.dsn, _options).then(() => {
-                NSSentry.setLogLevel(_options.debug ? 2 : 1);
-            });
+            NSSentry.startWithDsnString(_options.dsn, _options);
+            // .then(() => {
+            //     // NSSentry.setLogLevel(_options.debug ? 2 : 1);
+            // });
         } else {
             // if (__DEV__ && _options.enableNativeNagger) {
             //     Alert.alert(
@@ -89,7 +108,7 @@ export class NativescriptBackend extends BaseBackend<BrowserOptions> {
 
         const transportOptions = {
             ...this._options.transportOptions,
-            dsn: this._options.dsn,
+            dsn: this._options.dsn
         };
 
         if (this._options.transport) {
@@ -136,12 +155,11 @@ export class NativescriptBackend extends BaseBackend<BrowserOptions> {
     }
 }
 
-
 /**
-* Convert js severity level which has critical and log to more widely supported levels.
-* @param level
-* @returns More widely supported Severity level strings
-*/
+ * Convert js severity level which has critical and log to more widely supported levels.
+ * @param level
+ * @returns More widely supported Severity level strings
+ */
 export function _processLevel(level: Severity): Severity {
     if (level === Severity.Critical) {
         return Severity.Fatal;

plugin/platforms/ios/src/module.modulemap

@@ -1,9 +1,7 @@
 import { BaseClient, Scope } from '@sentry/core';
-import { Event, EventHint } from '@sentry/types';
-import { SyncPromise } from '@sentry/utils';
 
 import { NativescriptBackend, NativescriptOptions } from './backend';
-import { SDK_NAME, SDK_VERSION } from './version';
+import { NSSentry } from './nssentry';
 
 /**
  * The Sentry React Native SDK Client.
@@ -21,31 +19,20 @@ export class NativescriptClient extends BaseClient<NativescriptBackend, Nativesc
     }
 
     /**
-     * @inheritDoc
-     */
-    protected _prepareEvent(event: Event, scope?: Scope, hint?: EventHint): SyncPromise<Event | null> {
-        event.platform = event.platform || 'javascript';
-        event.sdk = {
-            ...event.sdk,
-            name: SDK_NAME,
-            packages: [
-                ...((event.sdk && event.sdk.packages) || []),
-                {
-                    name: 'npm:@nativescript-community/sentry',
-                    version: SDK_VERSION
-                }
-            ],
-            version: SDK_VERSION
-        };
-
-        return super._prepareEvent(event, scope, hint) as any;
-    }
+   * If native client is available it will trigger a native crash.
+   * Use this only for testing purposes.
+   */
+  public nativeCrash(): void {
+    this._getBackend().nativeCrash();
+  }
 
-    /**
-     * If native client is available it will trigger a native crash.
-     * Use this only for testing purposes.
-     */
-    public nativeCrash(): void {
-        this._getBackend().nativeCrash();
-    }
-}
+  /**
+   * @inheritDoc
+   */
+  public close(): PromiseLike<boolean> {
+    // As super.close() flushes queued events, we wait for that to finish before closing the native SDK.
+    return super.close().then((result: boolean) => {
+      return NSSentry.closeNativeSdk().then(() => result) as PromiseLike<boolean>;
+    });
+  }
+}