Skip to content

Commit 9ab1b2d

Browse files
authored
Merge branch 'main' into alwx/bug/5187
2 parents 09436db + 955f2eb commit 9ab1b2d

27 files changed

+223
-144
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # [email protected]
47+
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # [email protected]
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
5555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5656
# If this step fails, then you should remove it and run the build manually (see below)
5757
- name: Autobuild
58-
uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # [email protected]
58+
uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # [email protected]
5959

6060
# ℹ️ Command-line programs to run using the OS shell.
6161
# 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
6666
# make bootstrap
6767
# make release
6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # [email protected]
69+
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # [email protected]

CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
99
## Unreleased
1010

11+
### Features
12+
13+
- Adds support for Gradle 9 ([#5233](https://github.com/getsentry/sentry-react-native/pull/5233))
14+
1115
### Fixes
1216

1317
- Fixes .env file loading in Expo sourcemap uploads ([#5210](https://github.com/getsentry/sentry-react-native/pull/5210))
@@ -18,12 +22,18 @@
1822
- Bump Cocoa SDK from v8.56.1 to v8.56.2 ([#5214](https://github.com/getsentry/sentry-react-native/pull/5214))
1923
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8562)
2024
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.56.1...8.56.2)
21-
- 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))
22-
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8220)
23-
- [diff](https://github.com/getsentry/sentry-java/compare/8.21.1...8.22.0)
25+
- Bump Android SDK from v8.21.1 to v8.23.0 ([#5193](https://github.com/getsentry/sentry-react-native/pull/5193), [#5194](https://github.com/getsentry/sentry-react-native/pull/5194), [#5232](https://github.com/getsentry/sentry-react-native/pull/5232))
26+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8230)
27+
- [diff](https://github.com/getsentry/sentry-java/compare/8.21.1...8.23.0)
2428
- Bump CLI from v2.55.0 to v2.56.0 ([#5223](https://github.com/getsentry/sentry-react-native/pull/5223))
2529
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2560)
2630
- [diff](https://github.com/getsentry/sentry-cli/compare/2.55.0...2.56.0)
31+
- Bump JavaScript SDK from v10.12.0 to v10.17.0 ([#5195](https://github.com/getsentry/sentry-react-native/pull/5195))
32+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10170)
33+
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.12.0...10.17.0)
34+
- Bump Android SDK Stubs from v8.22.0 to v8.23.0 ([#5231](https://github.com/getsentry/sentry-react-native/pull/5231))
35+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8230)
36+
- [diff](https://github.com/getsentry/sentry-java/compare/8.22.0...8.23.0)
2737

2838
## 7.2.0
2939

dev-packages/e2e-tests/cli.mjs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,18 @@ if (actions.includes('create')) {
103103
env: env,
104104
});
105105

106+
// Only apply the package.json patch for newer RN versions
107+
const versionNumber = parseFloat(RNVersion.replace(/[^\d.]/g, ''));
108+
if (versionNumber >= 0.80) {
109+
execSync(`${patchScriptsDir}/rn.patch.package.json.js --path package.json`, {
110+
stdio: 'inherit',
111+
cwd: appDir,
112+
env: env,
113+
});
114+
} else {
115+
console.log(`Skipping rn.patch.package.json.js for RN ${RNVersion} (< 0.80)`);
116+
}
117+
106118
// Install dependencies
107119
// yalc add doesn't fail if the package is not found - it skips silently.
108120
let yalcAddOutput = execSync(`yalc add @sentry/react-native`, { cwd: appDir, env: env, encoding: 'utf-8' });

dev-packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@babel/preset-env": "^7.25.3",
1515
"@babel/preset-typescript": "^7.18.6",
16-
"@sentry/core": "10.12.0",
16+
"@sentry/core": "10.17.0",
1717
"@sentry/react-native": "7.2.0",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/usr/bin/env node
2+
3+
const fs = require('fs');
4+
const path = require('path');
5+
const { argv, cwd } = require('process');
6+
const parseArgs = require('minimist');
7+
const { debug } = require('@sentry/core');
8+
debug.enable();
9+
10+
const args = parseArgs(argv.slice(2), { string: ['app','path','file'], alias: { path: ['file'] } });
11+
12+
function resolvePkgPath() {
13+
if (args.path) {
14+
const p = path.resolve(args.path);
15+
if (!p.endsWith('package.json')) throw new Error(`--path must point to package.json, got: ${p}`);
16+
return p;
17+
}
18+
if (args.app) return path.join(path.resolve(args.app), 'package.json');
19+
return path.join(cwd(), 'package.json');
20+
}
21+
22+
const pkgPath = resolvePkgPath();
23+
if (!fs.existsSync(pkgPath)) throw new Error(`package.json not found at: ${pkgPath}`);
24+
25+
const raw = fs.readFileSync(pkgPath, 'utf8');
26+
let pkg;
27+
try { pkg = JSON.parse(raw); } catch (e) { throw new Error(`Invalid JSON: ${e.message}`); }
28+
29+
const METRO_VERSION = '0.83.2';
30+
31+
// List of Metro packages that need to be pinned
32+
const METRO_PACKAGES = [
33+
'metro',
34+
'metro-config'
35+
];
36+
37+
pkg.overrides = pkg.overrides || {};
38+
METRO_PACKAGES.forEach(pkgName => {
39+
pkg.overrides[pkgName] = METRO_VERSION;
40+
});
41+
42+
pkg.resolutions = pkg.resolutions || {};
43+
METRO_PACKAGES.forEach(pkgName => {
44+
pkg.resolutions[pkgName] = METRO_VERSION;
45+
});
46+
47+
fs.writeFileSync(pkgPath + '.bak', raw);
48+
fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
49+
50+
debug.log('Patched package.json: Metro packages set to', METRO_VERSION);

packages/core/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ android {
5555
dependencies {
5656
compileOnly files('libs/replay-stubs.jar')
5757
implementation 'com.facebook.react:react-native:+'
58-
api 'io.sentry:sentry-android:8.22.0'
58+
api 'io.sentry:sentry-android:8.23.0'
5959
}
0 Bytes
Binary file not shown.

packages/core/android/replay-stubs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
1818
}
1919

2020
dependencies {
21-
compileOnly 'io.sentry:sentry:8.22.0'
21+
compileOnly 'io.sentry:sentry:8.23.0'
2222
}

packages/core/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
},
7070
"dependencies": {
7171
"@sentry/babel-plugin-component-annotate": "4.3.0",
72-
"@sentry/browser": "10.12.0",
72+
"@sentry/browser": "10.17.0",
7373
"@sentry/cli": "2.56.0",
74-
"@sentry/core": "10.12.0",
75-
"@sentry/react": "10.12.0",
76-
"@sentry/types": "10.12.0"
74+
"@sentry/core": "10.17.0",
75+
"@sentry/react": "10.17.0",
76+
"@sentry/types": "10.17.0"
7777
},
7878
"devDependencies": {
7979
"@babel/core": "^7.25.2",
8080
"@expo/metro-config": "~0.20.0",
8181
"@mswjs/interceptors": "^0.25.15",
8282
"@react-native/babel-preset": "0.77.1",
83-
"@sentry-internal/eslint-config-sdk": "10.12.0",
84-
"@sentry-internal/eslint-plugin-sdk": "10.12.0",
85-
"@sentry-internal/typescript": "10.12.0",
83+
"@sentry-internal/eslint-config-sdk": "10.17.0",
84+
"@sentry-internal/eslint-plugin-sdk": "10.17.0",
85+
"@sentry-internal/typescript": "10.17.0",
8686
"@sentry/wizard": "6.5.0",
8787
"@testing-library/react-native": "^12.7.2",
8888
"@types/jest": "^29.5.13",

packages/core/plugin/src/withSentryAndroidGradlePlugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export interface SentryAndroidGradlePluginOptions {
1313
includeSourceContext?: boolean;
1414
}
1515

16-
export const sentryAndroidGradlePluginVersion = '5.12.0';
16+
export const sentryAndroidGradlePluginVersion = '5.12.1';
1717

1818
/**
1919
* Adds the Sentry Android Gradle Plugin to the project.

0 commit comments

Comments
 (0)