Merge branch 'main' into v8

antonis · antonis · commit f0aee9803c5f · 2026-01-23T11:40:52.000+01:00
# Conflicts:
#	CHANGELOG.md
#	packages/core/package.json
#	yarn.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,6 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
-
 ## Unreleased
 
 ### Dependencies
@@ -17,12 +16,27 @@
 - Bump CLI from v2.58.4 to v3.1.0 ([#5523](https://github.com/getsentry/sentry-react-native/pull/5523), [#5471](https://github.com/getsentry/sentry-react-native/pull/5471), [#5514](https://github.com/getsentry/sentry-react-native/pull/5514), [#5502](https://github.com/getsentry/sentry-react-native/pull/5502))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#310)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.58.4...3.1.0)
+
+## 7.10.0
+
+### Fixes
+
+- Fixes Android incompatibility with Firebase dependencies ([#5563](https://github.com/getsentry/sentry-react-native/pull/5563))
+
+### Dependencies
+
 - Bump Bundler Plugins from v4.6.2 to v4.7.0 ([#5554](https://github.com/getsentry/sentry-react-native/pull/5554))
   - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#470)
   - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.6.2...4.7.0)
-- Bump JavaScript SDK from v10.34.0 to v10.35.0 ([#5555](https://github.com/getsentry/sentry-react-native/pull/5555))
-  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10350)
-  - [diff](https://github.com/getsentry/sentry-javascript/compare/10.34.0...10.35.0)
+- Bump Android SDK from v8.30.0 to v8.31.0 ([#5563](https://github.com/getsentry/sentry-react-native/pull/5563))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8310)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.30.0...8.31.0)
+- Bump Android SDK Stubs from v8.30.0 to v8.31.0 ([#5562](https://github.com/getsentry/sentry-react-native/pull/5562))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8310)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.30.0...8.31.0)
+- Bump JavaScript SDK from v10.34.0 to v10.36.0 ([#5555](https://github.com/getsentry/sentry-react-native/pull/5555), [#5564](https://github.com/getsentry/sentry-react-native/pull/5564))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10360)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/10.34.0...10.36.0)
 
 ## 7.9.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.9.0",
+  "version": "7.10.0",
   "private": true,
   "description": "Sentry React Native End to End Tests Library",
   "main": "dist/index.js",
@@ -13,8 +13,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@sentry/core": "10.35.0",
-    "@sentry/react-native": "7.9.0",
+    "@sentry/core": "10.36.0",
+    "@sentry/react-native": "7.10.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.9.0",
+  "version": "7.10.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.9.0",
+  "version": "7.10.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.9.0",
+  "version": "7.10.0",
   "packages": [
     "packages/*",
     "dev-packages/*",
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.30.0'
+    api 'io.sentry:sentry-android:8.31.0'
 }
diff --git a/packages/core/android/libs/replay-stubs.jar b/packages/core/android/libs/replay-stubs.jar
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.30.0'
+  compileOnly 'io.sentry:sentry:8.31.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.9.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "7.10.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.9.0";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"7.10.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.9.0",
+  "version": "7.10.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -69,20 +69,20 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "4.7.0",
-    "@sentry/browser": "10.35.0",
+    "@sentry/browser": "10.36.0",
     "@sentry/cli": "3.1.0",
-    "@sentry/core": "10.35.0",
-    "@sentry/react": "10.35.0",
-    "@sentry/types": "10.35.0"
+    "@sentry/core": "10.36.0",
+    "@sentry/react": "10.36.0",
+    "@sentry/types": "10.36.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
     "@expo/metro-config": "~0.20.0",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.80.0",
-    "@sentry-internal/eslint-config-sdk": "10.35.0",
-    "@sentry-internal/eslint-plugin-sdk": "10.35.0",
-    "@sentry-internal/typescript": "10.35.0",
+    "@sentry-internal/eslint-config-sdk": "10.36.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.36.0",
+    "@sentry-internal/typescript": "10.36.0",
     "@sentry/wizard": "6.11.0",
     "@testing-library/react-native": "^13.2.2",
     "@types/jest": "^29.5.13",
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.9.0';
+export const SDK_VERSION = '7.10.0';
diff --git a/performance-tests/TestAppPlain/package.json b/performance-tests/TestAppPlain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppPlain",
-  "version": "7.9.0",
+  "version": "7.10.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/performance-tests/TestAppSentry/package.json b/performance-tests/TestAppSentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppSentry",
-  "version": "7.9.0",
+  "version": "7.10.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@react-native/new-app-screen": "0.80.2",
-    "@sentry/react-native": "7.9.0",
+    "@sentry/react-native": "7.10.0",
     "react": "19.1.0",
     "react-native": "0.80.2"
   },
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.9.0",
+    "version": "7.10.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -20,15 +20,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "67"
+      "buildNumber": "68"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 67
+      "versionCode": 68
     },
     "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.9.0",
+  "version": "7.10.0",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",
@@ -22,8 +22,8 @@
     "eas-build-development-android": "eas build --profile development --platform android"
   },
   "dependencies": {
-    "@sentry/core": "10.35.0",
-    "@sentry/react-native": "7.9.0",
+    "@sentry/core": "10.36.0",
+    "@sentry/react-native": "7.10.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.9.0",
+  "version": "7.10.0",
   "private": true,
   "scripts": {
     "start": "react-native start --experimental-debugger",
@@ -16,9 +16,9 @@
     "@react-navigation/bottom-tabs": "^6.5.12",
     "@react-navigation/native": "^6.1.9",
     "@react-navigation/stack": "^6.3.20",
-    "@sentry/core": "10.35.0",
-    "@sentry/react": "10.35.0",
-    "@sentry/react-native": "7.9.0",
+    "@sentry/core": "10.36.0",
+    "@sentry/react": "10.36.0",
+    "@sentry/react-native": "7.10.0",
     "delay": "^6.0.0",
     "react": "18.2.0",
     "react-native": "0.73.9",
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 69
-        versionName "7.9.0"
+        versionCode 70
+        versionName "7.10.0"
     }
 
     signingConfigs {
diff --git a/samples/react-native/ios/sentryreactnativesample/Info.plist b/samples/react-native/ios/sentryreactnativesample/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.9.0</string>
+	<string>7.10.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>74</string>
+	<string>75</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>
diff --git a/samples/react-native/ios/sentryreactnativesampleTests/Info.plist b/samples/react-native/ios/sentryreactnativesampleTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.9.0</string>
+	<string>7.10.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>74</string>
+	<string>75</string>
 </dict>
 </plist>
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-sample",
-  "version": "7.9.0",
+  "version": "7.10.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -29,9 +29,9 @@
     "@react-navigation/native-stack": "^7.3.24",
     "@react-navigation/stack": "^7.4.5",
     "@reduxjs/toolkit": "^2.8.2",
-    "@sentry/core": "10.35.0",
-    "@sentry/react": "10.35.0",
-    "@sentry/react-native": "7.9.0",
+    "@sentry/core": "10.36.0",
+    "@sentry/react": "10.36.0",
+    "@sentry/react-native": "7.10.0",
     "@shopify/flash-list": "^2.0.2",
     "delay": "^6.0.0",
     "react": "19.1.0",
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.9.0",`
	`4`	`+ "version": "7.10.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.9.0",`
	`3`	`+ "version": "7.10.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.9.0",`
	`3`	`+ "version": "7.10.0",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*",`
`6`	`6`	`"dev-packages/*",`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,5 @@ android {`
`55`	`55`	`dependencies {`
`56`	`56`	`compileOnly files('libs/replay-stubs.jar')`
`57`	`57`	`implementation 'com.facebook.react:react-native:+'`
`58`		`- api 'io.sentry:sentry-android:8.30.0'`
	`58`	`+ api 'io.sentry:sentry-android:8.31.0'`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- compileOnly 'io.sentry:sentry:8.30.0'`
	`21`	`+ compileOnly 'io.sentry:sentry:8.31.0'`
`22`	`22`	`}`