Merge branch 'main' into alwx/bug/5187

alwx · web-flow · commit f2505663aafc · 2025-09-30T10:43:20.000+02:00
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -67,6 +67,17 @@ jobs:
           clang --version
           clang-format --version
 
+      - name: Install Swiftly
+        run: |
+          SWIFTLY_FILE="swiftly-$(uname -m).tar.gz"
+          curl -sL https://download.swift.org/swiftly/linux/swiftly-x86_64.tar.gz -o $SWIFTLY_FILE
+          tar zxf $SWIFTLY_FILE
+
+          ./swiftly init --quiet-shell-followup
+          . "${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}/env.sh"
+          hash -r
+          sudo apt-get -y install libcurl4-openssl-dev
+
       - name: Lint
         run: yarn lint
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # pin@v3.29.5
+        uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # pin@v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,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@192325c86100d080feab897ff886c34abd4c83a3 # pin@v3.29.5
+        uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # pin@v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # pin@v3.29.5
+        uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # pin@v3.29.5
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,6 @@ node_modules.bak
 # Sentry React Native Monorepo
 /packages/core/README.md
 .env.sentry-build-plugin
+
+# SwiftLint
+swiftlint/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,17 @@
 
 ## Unreleased
 
+### Dependencies
+
+- Bump Cocoa SDK from v8.56.1 to v8.56.2 ([#5214](https://github.com/getsentry/sentry-react-native/pull/5214))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8562)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.56.1...8.56.2)
+- Bump Android SDK from v8.21.1 to v8.22.0 ([#5193](https://github.com/getsentry/sentry-react-native/pull/5193), [#5194](https://github.com/getsentry/sentry-react-native/pull/5194))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8220)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.21.1...8.22.0)
+
+## 7.2.0
+
 ### Features
 
 - Enable logs on native side of iOS ([#5190](https://github.com/getsentry/sentry-react-native/pull/5190))
@@ -16,6 +27,16 @@
 ### Fixes
 
 - Vendor `metro/countLines` function to avoid issues with the private import ([#5185](https://github.com/getsentry/sentry-react-native/pull/5185))
+- Fix baseJSBundle and bundleToString TypeErrors with Metro 0.83.2 ([#5206](https://github.com/getsentry/sentry-react-native/pull/5206))
+
+### Dependencies
+
+- Bump CLI from v2.53.0 to v2.55.0 ([#5179](https://github.com/getsentry/sentry-react-native/pull/5179))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2550)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.53.0...2.55.0)
+- Bump Cocoa SDK from v8.56.0 to v8.56.1 ([#5197](https://github.com/getsentry/sentry-react-native/pull/5197))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8561)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.56.0...8.56.1)
 
 ## 7.1.0
 
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "private": true,
   "description": "Sentry React Native End to End Tests Library",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
     "@sentry/core": "10.12.0",
-    "@sentry/react-native": "7.1.0",
+    "@sentry/react-native": "7.2.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",
diff --git a/dev-packages/type-check/package.json b/dev-packages/type-check/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "7.1.0",
+  "version": "7.2.0",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }
diff --git a/dev-packages/utils/package.json b/dev-packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-samples-utils",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Internal Samples Utils",
   "main": "index.js",
   "license": "MIT",
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "packages": [
     "packages/*",
     "dev-packages/*",
diff --git a/package.json b/package.json
@@ -28,9 +28,8 @@
     "set-version-samples": "lerna run set-version"
   },
   "devDependencies": {
-    "@expo/swiftlint": "^0.57.1",
     "@naturalcycles/ktlint": "^1.13.0",
-    "@sentry/cli": "2.53.0",
+    "@sentry/cli": "2.55.0",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",
     "lerna": "^8.1.8",
diff --git a/packages/core/RNSentry.podspec b/packages/core/RNSentry.podspec
@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.56.0'
+  s.dependency 'Sentry/HybridSDK', '8.56.2'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)
diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
@@ -55,5 +55,5 @@ android {
 dependencies {
     compileOnly files('libs/replay-stubs.jar')
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:8.21.1'
+    api 'io.sentry:sentry-android:8.22.0'
 }
diff --git a/packages/core/android/replay-stubs/build.gradle b/packages/core/android/replay-stubs/build.gradle
@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
 }
 
 dependencies {
-  compileOnly 'io.sentry:sentry:8.21.1'
+  compileOnly 'io.sentry:sentry:8.22.0'
 }
diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java
@@ -2,7 +2,7 @@
 
 class RNSentryVersion {
   static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native";
-  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "7.1.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "7.2.0";
   static final String NATIVE_SDK_NAME = "sentry.native.android.react-native";
   static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
   static final String REACT_NATIVE_SDK_NAME = "sentry.javascript.react-native";
diff --git a/packages/core/ios/RNSentryVersion.m b/packages/core/ios/RNSentryVersion.m
@@ -3,4 +3,4 @@
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"7.1.0";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"7.2.0";
diff --git a/packages/core/package.json b/packages/core/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": "7.1.0",
+  "version": "7.2.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -70,7 +70,7 @@
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "4.3.0",
     "@sentry/browser": "10.12.0",
-    "@sentry/cli": "2.53.0",
+    "@sentry/cli": "2.55.0",
     "@sentry/core": "10.12.0",
     "@sentry/react": "10.12.0",
     "@sentry/types": "10.12.0"
@@ -83,7 +83,7 @@
     "@sentry-internal/eslint-config-sdk": "10.12.0",
     "@sentry-internal/eslint-plugin-sdk": "10.12.0",
     "@sentry-internal/typescript": "10.12.0",
-    "@sentry/wizard": "6.4.0",
+    "@sentry/wizard": "6.5.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",
diff --git a/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts b/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts
@@ -13,7 +13,7 @@ export interface SentryAndroidGradlePluginOptions {
   includeSourceContext?: boolean;
 }
 
-export const sentryAndroidGradlePluginVersion = '5.11.0';
+export const sentryAndroidGradlePluginVersion = '5.12.0';
 
 /**
  * Adds the Sentry Android Gradle Plugin to the project.
diff --git a/packages/core/scripts/expo-upload-sourcemaps.js b/packages/core/scripts/expo-upload-sourcemaps.js
@@ -131,7 +131,7 @@ try {
 
 const sentryBuildPluginPath = path.join(projectRoot, '.env.sentry-build-plugin');
 if (fs.existsSync(sentryBuildPluginPath)) {
-  loadDotenv();
+  loadDotenv(sentryBuildPluginPath);
 }
 
 let sentryOrg = getEnvVar(SENTRY_ORG);
diff --git a/packages/core/src/js/tools/vendor/metro/utils.ts b/packages/core/src/js/tools/vendor/metro/utils.ts
@@ -31,13 +31,19 @@ import type * as sourceMapStringType from 'metro/private/DeltaBundler/Serializer
 import type * as bundleToStringType from 'metro/private/lib/bundleToString';
 import type { MetroSerializer } from '../../utils';
 
-let baseJSBundle: typeof baseJSBundleType;
+let baseJSBundleModule: any;
 try {
-  baseJSBundle = require('metro/private/DeltaBundler/Serializers/baseJSBundle');
-} catch (e) {
-  baseJSBundle = require('metro/src/DeltaBundler/Serializers/baseJSBundle');
+  baseJSBundleModule = require('metro/private/DeltaBundler/Serializers/baseJSBundle');
+} catch {
+  baseJSBundleModule = require('metro/src/DeltaBundler/Serializers/baseJSBundle');
 }
 
+const baseJSBundle: typeof baseJSBundleType =
+  typeof baseJSBundleModule === 'function'
+    ? baseJSBundleModule
+    : // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      baseJSBundleModule?.baseJSBundle ?? baseJSBundleModule?.default;
+
 let sourceMapString: typeof sourceMapStringType;
 try {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -52,13 +58,19 @@ try {
   }
 }
 
-let bundleToString: typeof bundleToStringType;
+let bundleToStringModule: any;
 try {
-  bundleToString = require('metro/private/lib/bundleToString');
-} catch (e) {
-  bundleToString = require('metro/src/lib/bundleToString');
+  bundleToStringModule = require('metro/private/lib/bundleToString');
+} catch {
+  bundleToStringModule = require('metro/src/lib/bundleToString');
 }
 
+const bundleToString: typeof bundleToStringType =
+  typeof bundleToStringModule === 'function'
+    ? bundleToStringModule
+    : // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      bundleToStringModule?.bundleToString ?? bundleToStringModule?.default;
+
 type NewSourceMapStringExport = {
   // Since Metro v0.80.10 https://github.com/facebook/metro/compare/v0.80.9...v0.80.10#diff-1b836d1729e527a725305eef0cec22e44605af2700fa413f4c2489ea1a03aebcL28
   sourceMapString: typeof sourceMapString;
diff --git a/packages/core/src/js/version.ts b/packages/core/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 = '7.1.0';
+export const SDK_VERSION = '7.2.0';
diff --git a/performance-tests/TestAppPlain/package.json b/performance-tests/TestAppPlain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppPlain",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/performance-tests/TestAppSentry/package.json b/performance-tests/TestAppSentry/package.json
@@ -1,14 +1,14 @@
 {
   "name": "TestAppSentry",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "start": "react-native start"
   },
   "dependencies": {
-    "@sentry/react-native": "7.1.0",
+    "@sentry/react-native": "7.2.0",
     "react": "18.1.0",
     "react-native": "0.70.15"
   },
diff --git a/samples/expo/app.json b/samples/expo/app.json
@@ -5,7 +5,7 @@
     "jsEngine": "hermes",
     "newArchEnabled": true,
     "scheme": "sentry-expo-sample",
-    "version": "7.1.0",
+    "version": "7.2.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -20,15 +20,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "59"
+      "buildNumber": "60"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 59
+      "versionCode": 60
     },
     "web": {
       "bundler": "metro",
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-expo-sample",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",
@@ -20,7 +20,7 @@
     "eas-build-development-android": "eas build --profile development --platform android"
   },
   "dependencies": {
-    "@sentry/react-native": "7.1.0",
+    "@sentry/react-native": "7.2.0",
     "@types/react": "~19.0.10",
     "expo": "^53.0.0",
     "expo-constants": "~17.1.5",
diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-macos-sample",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "private": true,
   "scripts": {
     "start": "react-native start --experimental-debugger",
@@ -18,7 +18,7 @@
     "@react-navigation/stack": "^6.3.20",
     "@sentry/core": "10.12.0",
     "@sentry/react": "10.12.0",
-    "@sentry/react-native": "7.1.0",
+    "@sentry/react-native": "7.2.0",
     "delay": "^6.0.0",
     "react": "18.2.0",
     "react-native": "0.73.9",
diff --git a/samples/react-native/Gemfile.lock b/samples/react-native/Gemfile.lock
@@ -237,7 +237,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.9)
+    rexml (3.4.2)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
diff --git a/samples/react-native/android/app/build.gradle b/samples/react-native/android/app/build.gradle
@@ -130,8 +130,8 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 61
-        versionName "7.1.0"
+        versionCode 62
+        versionName "7.2.0"
     }
 
     signingConfigs {
diff --git a/samples/react-native/android/build.gradle b/samples/react-native/android/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-        classpath("io.sentry:sentry-android-gradle-plugin:5.11.0")
+        classpath("io.sentry:sentry-android-gradle-plugin:5.12.0")
     }
 }
 
diff --git a/samples/react-native/ios/sentryreactnativesample/Info.plist b/samples/react-native/ios/sentryreactnativesample/Info.plist
diff --git a/samples/react-native/ios/sentryreactnativesampleTests/Info.plist b/samples/react-native/ios/sentryreactnativesampleTests/Info.plist
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
diff --git a/scripts/swiftlint.sh b/scripts/swiftlint.sh
diff --git a/scripts/update-android-stubs.sh b/scripts/update-android-stubs.sh
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-type-check",`
`3`	`3`	`"private": true,`
`4`		`- "version": "7.1.0",`
	`4`	`+ "version": "7.2.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"type-check": "./run-type-check.sh"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-samples-utils",`
`3`		`- "version": "7.1.0",`
	`3`	`+ "version": "7.2.0",`
`4`	`4`	`"description": "Internal Samples Utils",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`3`		`- "version": "7.1.0",`
	`3`	`+ "version": "7.2.0",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*",`
`6`	`6`	`"dev-packages/*",`