Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@

- 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 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)

## 8.14.0

### Features
Expand Down
2 changes: 1 addition & 1 deletion packages/core/RNSentry.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/core/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ android {
}
}

def sentryAndroidVersion = '8.43.1'
def sentryAndroidVersion = '8.43.2'

dependencies {
compileOnly files('libs/replay-stubs.jar')
Expand Down
2 changes: 1 addition & 1 deletion packages/core/android/expo-handler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Binary file modified packages/core/android/libs/replay-stubs.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/core/android/replay-stubs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
}

dependencies {
compileOnly 'io.sentry:sentry:8.43.1'
compileOnly 'io.sentry:sentry:8.43.2'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion packages/core/sentry.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicBoolean
import java.util.regex.Pattern
import javax.inject.Inject

val expectedSentryAndroidVersion = "8.43.1"
val expectedSentryAndroidVersion = "8.43.2"

val sentryVersionCheckWarned = AtomicBoolean(false)
project.configurations.configureEach {
Expand Down
2 changes: 1 addition & 1 deletion samples/react-native/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down
48 changes: 31 additions & 17 deletions scripts/check-android-sdk-mismatch.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading