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

.github/workflows/e2e.yml

@@ -40,7 +40,7 @@ jobs:
         platform: ["ios", "android"]
         include:
           - platform: ios
-            runs-on: macos-latest
+            runs-on: macos-12
             name: iOS
             appPlain: test/perf/test-app-plain.ipa
           - platform: android
@@ -49,6 +49,10 @@ jobs:
             appPlain: test/perf/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk
     steps:
       - uses: actions/checkout@v4
+
+      - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer
+        if: ${{ matrix.platform == 'ios' }}
+
       - uses: actions/setup-node@v4
         with:
           node-version: 18
@@ -178,7 +182,7 @@ jobs:
             device: 'iPhone 14'
           - platform: ios
             rn-version: '0.65.3'
-            runs-on: macos-latest
+            runs-on: macos-12
             runtime: 'latest'
             device: 'iPhone 14'
           - platform: android
@@ -224,6 +228,9 @@ jobs:
           echo "SENTRY_RELEASE=$SENTRY_RELEASE"
           echo "SENTRY_DIST=$SENTRY_DIST"
 
+      - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer
+        if: ${{ matrix.platform == 'ios' && matrix.rn-version == '0.65.3' }}
+
       - uses: actions/setup-node@v4
         with:
           node-version: 18

CHANGELOG.md

@@ -6,6 +6,14 @@
 
 - Remove `tunnel` from SDK Options ([#3787](https://github.com/getsentry/sentry-react-native/pull/3787))
 
+## 5.22.1
+
+### Dependencies
+
+- Bump Cocoa SDK from v8.24.0 to v8.25.0 ([#3790](https://github.com/getsentry/sentry-react-native/pull/3790))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8250)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.24.0...8.25.0)
+
 ## 5.22.0
 
 ### Features

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Sentry
+Copyright (c) 2017-2024 Sentry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

RNSentry.podspec

@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = '*.js'
 
   s.dependency 'React-Core'
-  s.dependency 'Sentry/HybridSDK', '8.24.0'
+  s.dependency 'Sentry/HybridSDK', '8.25.0'
 
   s.source_files = 'ios/**/*.{h,m,mm}'
   s.public_header_files = 'ios/RNSentry.h'

package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "5.22.0",
+  "version": "5.22.1",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",

samples/expo/app.json

@@ -4,7 +4,7 @@
     "slug": "sentry-react-native-expo-sample",
     "jsEngine": "hermes",
     "scheme": "sentry-expo-sample",
-    "version": "5.22.0",
+    "version": "5.22.1",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -19,15 +19,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "4"
+      "buildNumber": "5"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 4
+      "versionCode": 5
     },
     "web": {
       "bundler": "metro",

samples/expo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-expo-sample",
-  "version": "5.22.0",
+  "version": "5.22.1",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",

samples/react-native/android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 11
-        versionName "5.22.0"
+        versionCode 12
+        versionName "5.22.1"
     }
 
     signingConfigs {

samples/react-native/ios/sentryreactnativesample/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.22.0</string>
+	<string>5.22.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>

samples/react-native/ios/sentryreactnativesampleTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.22.0</string>
+	<string>5.22.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 </dict>
 </plist>

samples/react-native/metro.config.js

@@ -19,6 +19,21 @@ const config = {
     `${parentDir}/node_modules`,
   ],
   resolver: {
+    resolveRequest: (context, moduleName, platform) => {
+      if (moduleName.includes('promise/')) {
+        return context.resolveRequest(
+          {
+            ...context,
+            // Ensures the promise module is resolved from the sample's node_modules.
+            allowHaste: false,
+            disableHierarchicalLookup: true,
+          },
+          moduleName,
+          platform,
+        );
+      }
+      return context.resolveRequest(context, moduleName, platform);
+    },
     blacklistRE: blacklist([
       new RegExp(`${parentDir}/node_modules/react-native/.*`),
       new RegExp('.*\\android\\.*'), // Required for Windows in order to run the Sample.

samples/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-sample",
-  "version": "5.22.0",
+  "version": "5.22.1",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",

src/js/version.ts

@@ -1,3 +1,3 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '5.22.0';
+export const SDK_VERSION = '5.22.1';