From 6a5932d1d7d6f5ae880a64d7557b742d6cc424b8 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Mon, 15 Jun 2026 09:26:08 +0200 Subject: [PATCH 1/5] fix(ci): Support version catalog in android SDK version check The sentry-android-gradle-plugin moved the bundled SDK version from plugin-build/gradle.properties to gradle/libs.versions.toml in 6.10.0. Fall back to the TOML file when gradle.properties lacks sdk_version. Co-Authored-By: Claude Opus 4.6 --- scripts/check-android-sdk-mismatch.js | 48 +++++++++++++++++---------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/scripts/check-android-sdk-mismatch.js b/scripts/check-android-sdk-mismatch.js index 6136f29c19..bf07287420 100644 --- a/scripts/check-android-sdk-mismatch.js +++ b/scripts/check-android-sdk-mismatch.js @@ -9,37 +9,51 @@ const createSectionWarning = (title, content, icon = '❌') => { return `### ${icon} ${title}\n\n${content}\n`; }; -/** - * Fetches the SDK version from gradle.properties in the gradle plugin GitHub repo. - * The file contains a line like: sdk_version = X.Y.Z - */ -function fetchBundledSentryAndroidVersion(gradlePluginVersion) { +function fetchFileContent(url) { return new Promise((resolve, reject) => { - const url = `https://raw.githubusercontent.com/getsentry/sentry-android-gradle-plugin/${gradlePluginVersion}/plugin-build/gradle.properties`; - https .get(url, res => { if (res.statusCode !== 200) { - reject(new Error(`Could not fetch gradle.properties for version ${gradlePluginVersion}`)); + reject(new Error(`HTTP ${res.statusCode} for ${url}`)); return; } let data = ''; res.on('data', chunk => (data += chunk)); - res.on('end', () => { - // Look for: sdk_version = X.Y.Z - const versionMatch = data.match(/sdk_version\s*=\s*(\S+)/); - if (versionMatch) { - resolve(versionMatch[1]); - } else { - reject(new Error(`Could not find sdk_version in gradle.properties`)); - } - }); + res.on('end', () => resolve(data)); }) .on('error', reject); }); } +/** + * Fetches the SDK version from the gradle plugin GitHub repo. + * + * Checks gradle.properties first (sdk_version = X.Y.Z, pre-6.10.0), + * then falls back to gradle/libs.versions.toml (sentry = "X.Y.Z", 6.10.0+). + */ +function fetchBundledSentryAndroidVersion(gradlePluginVersion) { + const base = `https://raw.githubusercontent.com/getsentry/sentry-android-gradle-plugin/${gradlePluginVersion}`; + + return fetchFileContent(`${base}/plugin-build/gradle.properties`) + .then(data => { + const match = data.match(/sdk_version\s*=\s*(\S+)/); + if (match) { + return match[1]; + } + throw new Error('sdk_version not found'); + }) + .catch(() => + fetchFileContent(`${base}/gradle/libs.versions.toml`).then(data => { + const match = data.match(/^sentry\s*=\s*"([^"]+)"/m); + if (match) { + return match[1]; + } + throw new Error(`Could not find sentry-android version for gradle plugin ${gradlePluginVersion}`); + }), + ); +} + module.exports = async function ({ fail, warn, __, ___, danger }) { const gradlePluginFileChanged = danger.git.modified_files.includes(GRADLE_PLUGIN_FILE); const buildGradleFileChanged = danger.git.modified_files.includes(BUILD_GRADLE_FILE); From 6e99475fb416075f65090d3724d67c2521ef6d0f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2026 09:29:32 +0200 Subject: [PATCH 2/5] chore: update scripts/update-cocoa.sh to 9.17.1 (#6272) Co-authored-by: GitHub --- CHANGELOG.md | 6 ++++++ packages/core/RNSentry.podspec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d553f5fc9..9c2f2f0787 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ - Warn during dev builds when multiple versions of Sentry JS SDK are detected ([#6269](https://github.com/getsentry/sentry-react-native/pull/6269)) +### Dependencies + +- Bump Cocoa SDK from v9.16.1 to v9.17.1 ([#6272](https://github.com/getsentry/sentry-react-native/pull/6272)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#9171) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/9.16.1...9.17.1) + ## 8.14.0 ### Features diff --git a/packages/core/RNSentry.podspec b/packages/core/RNSentry.podspec index 514389d7df..a454f6a5e1 100644 --- a/packages/core/RNSentry.podspec +++ b/packages/core/RNSentry.podspec @@ -50,7 +50,7 @@ Pod::Spec.new do |s| 'DEFINES_MODULE' => 'YES' } - sentry_cocoa_version = '9.16.1' + sentry_cocoa_version = '9.17.1' # Opt-in to consuming sentry-cocoa via Swift Package Manager. # When `SENTRY_USE_SPM=1` is set, RNSentry pulls `Sentry` from the From 0c711d47ce9572c15be1d02dbf15db305d3b1ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2026 09:34:03 +0200 Subject: [PATCH 3/5] chore(deps): bump joi from 17.13.3 to 17.13.4 (#6279) Bumps [joi](https://github.com/hapijs/joi) from 17.13.3 to 17.13.4. - [Commits](https://github.com/hapijs/joi/compare/v17.13.3...v17.13.4) --- updated-dependencies: - dependency-name: joi dependency-version: 17.13.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index e989dba3fe..cd947f2c17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21517,15 +21517,15 @@ __metadata: linkType: hard "joi@npm:^17.2.1": - version: 17.13.3 - resolution: "joi@npm:17.13.3" - dependencies: - "@hapi/hoek": "npm:^9.3.0" - "@hapi/topo": "npm:^5.1.0" - "@sideway/address": "npm:^4.1.5" - "@sideway/formula": "npm:^3.0.1" - "@sideway/pinpoint": "npm:^2.0.0" - checksum: 66ed454fee3d8e8da1ce21657fd2c7d565d98f3e539d2c5c028767e5f38cbd6297ce54df8312d1d094e62eb38f9452ebb43da4ce87321df66cf5e3f128cbc400 + version: 17.13.4 + resolution: "joi@npm:17.13.4" + dependencies: + "@hapi/hoek": ^9.3.0 + "@hapi/topo": ^5.1.0 + "@sideway/address": ^4.1.5 + "@sideway/formula": ^3.0.1 + "@sideway/pinpoint": ^2.0.0 + checksum: 99e0a784f08cb0b6910bd42df094e4f3f047c2589c61b139b7eb25a21f814478a1d3b5c68134bbcc4153ac216cbae2710a2b7f56605974e5c66a0ebdfab08e8f languageName: node linkType: hard From 1684b6989639aebd4e82a3d9bacaaac89e75ac8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2026 09:44:23 +0200 Subject: [PATCH 4/5] chore: update scripts/update-android.sh to 8.43.2 (#6273) Co-authored-by: GitHub Co-authored-by: Antonis Lilis --- CHANGELOG.md | 3 +++ packages/core/android/build.gradle | 2 +- .../core/android/expo-handler/build.gradle | 2 +- packages/core/android/libs/replay-stubs.jar | Bin 1198 -> 1198 bytes .../core/android/replay-stubs/build.gradle | 2 +- packages/core/sentry.gradle.kts | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c2f2f0787..f6f8df5e3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ ### Dependencies +- Bump Android SDK from v8.43.1 to v8.43.2 ([#6273](https://github.com/getsentry/sentry-react-native/pull/6273)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8432) + - [diff](https://github.com/getsentry/sentry-java/compare/8.43.1...8.43.2) - Bump Cocoa SDK from v9.16.1 to v9.17.1 ([#6272](https://github.com/getsentry/sentry-react-native/pull/6272)) - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#9171) - [diff](https://github.com/getsentry/sentry-cocoa/compare/9.16.1...9.17.1) diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 7d2d6c1632..5052b2ef54 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -52,7 +52,7 @@ android { } } -def sentryAndroidVersion = '8.43.1' +def sentryAndroidVersion = '8.43.2' dependencies { compileOnly files('libs/replay-stubs.jar') diff --git a/packages/core/android/expo-handler/build.gradle b/packages/core/android/expo-handler/build.gradle index bf0d28d7dc..0b77c28784 100644 --- a/packages/core/android/expo-handler/build.gradle +++ b/packages/core/android/expo-handler/build.gradle @@ -20,5 +20,5 @@ android { dependencies { compileOnly project(':expo-modules-core') - compileOnly 'io.sentry:sentry-android:8.43.1' + compileOnly 'io.sentry:sentry-android:8.43.2' } diff --git a/packages/core/android/libs/replay-stubs.jar b/packages/core/android/libs/replay-stubs.jar index 6277ca3a5823b6969054dd1d9926398e1494bd79..98faaf7c10d626bc21e4abb51e5b8affc142ab28 100644 GIT binary patch delta 150 zcmZ3-xsH=Jz?+#xgn@yBgW;3%`H8%0%pl6lOAScHFaQA)hyVg+AkNI!XJ$avuuL7S z;etMhn#{y#2BJ4xGfrj%3tVI}0n;4J_F&qJSr1HCGn<0x&CIr7`ZKc&n6_dm0RSfC BFQ)(i delta 150 zcmZ3-xsH=Jz?+#xgn@yBgQ3&n#6(^-W)NlOrPg6_B8CA7m_P&&FavRBzCJSpLIY6A z#AWKtAnJlXh?>mAXa=G;TQg2(1Q|5>B9jT2=3ur5EAV301Jl*areJzAvn`nZ% Date: Mon, 15 Jun 2026 07:45:06 +0000 Subject: [PATCH 5/5] chore: update scripts/update-sentry-android-gradle-plugin.sh to 6.11.0 --- packages/core/plugin/src/withSentryAndroidGradlePlugin.ts | 2 +- samples/react-native/android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts b/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts index 2ec74a7c86..33ef95dc0d 100644 --- a/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts +++ b/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts @@ -15,7 +15,7 @@ export interface SentryAndroidGradlePluginOptions { includeSourceContext?: boolean; } -export const sentryAndroidGradlePluginVersion = '6.10.0'; +export const sentryAndroidGradlePluginVersion = '6.11.0'; /** * Adds the Sentry Android Gradle Plugin to the project. diff --git a/samples/react-native/android/build.gradle b/samples/react-native/android/build.gradle index 93aa48a8de..ea3913e90d 100644 --- 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:6.10.0") + classpath("io.sentry:sentry-android-gradle-plugin:6.11.0") } }