Merge remote-tracking branch 'origin/main' into 5.0.0

Author: krystofwoldrich

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # pin@v2
+        uses: github/codeql-action/init@a34ca99b4610d924e04c68db79e503e1f79f9f02 # pin@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # pin@v2
+        uses: github/codeql-action/autobuild@a34ca99b4610d924e04c68db79e503e1f79f9f02 # pin@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -61,4 +61,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # pin@v2
+        uses: github/codeql-action/analyze@a34ca99b4610d924e04c68db79e503e1f79f9f02 # pin@v2

.github/workflows/update-deps.yml

@@ -37,23 +37,26 @@ jobs:
     secrets:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
-  wizard:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
-    with:
-      path: scripts/update-wizard.sh
-      name: Wizard
-      pr-strategy: update
-    secrets:
-      api-token: ${{ secrets.CI_DEPLOY_KEY }}
+  # RN SDK v4 can't be updated to the latest wizard and cli
+  # This will be returned in v5
 
-  cli:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
-    with:
-      path: scripts/update-cli.sh
-      name: CLI
-      pr-strategy: update
-    secrets:
-      api-token: ${{ secrets.CI_DEPLOY_KEY }}
+  # wizard:
+  #   uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+  #   with:
+  #     path: scripts/update-wizard.sh
+  #     name: Wizard
+  #     pr-strategy: update
+  #   secrets:
+  #     api-token: ${{ secrets.CI_DEPLOY_KEY }}
+
+  # cli:
+  #   uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+  #   with:
+  #     path: scripts/update-cli.sh
+  #     name: CLI
+  #     pr-strategy: update
+  #   secrets:
+  #     api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   sample-rn:
     uses: getsentry/github-workflows/.github/workflows/updater.yml@v2

CHANGELOG.md

@@ -9,6 +9,12 @@
   - Remove `breadcrumb.level` value `critical` transformation to `fatal`.
   - Default `breadcrumb.level` is `info`
 
+### Dependencies
+
+- Bump Android SDK from v6.11.0 to v6.12.1 ([#2755](https://github.com/getsentry/sentry-react-native/pull/2755))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6121)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.11.0...6.12.1)
+
 ## 5.0.0-alpha.11
 
 - Latest changes from 4.13.0

android/build.gradle

@@ -42,5 +42,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:6.11.0'
+    api 'io.sentry:sentry-android:6.12.1'
 }

sample/src/App.tsx

@@ -26,8 +26,8 @@ Sentry.init({
   // Replace the example DSN below with your own DSN:
   dsn: SENTRY_INTERNAL_DSN,
   debug: true,
-  beforeSend: (e, hint) => {
-    console.log('Event beforeSend:', e, 'hint:', hint);
+  beforeSend: (e: Sentry.Event) => {
+    console.log('Event beforeSend:', e);
     return e;
   },
   // This will be called with a boolean `didCallNativeInit` when the native SDK has been contacted.

sample/yarn.lock

@@ -3912,9 +3912,9 @@ decamelize@^1.2.0:
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 decompress-response@^6.0.0:
   version "6.0.0"