Merge branch 'main' into alwx/experiment/cirrus-labs-for-everythin

Author: alwx

CHANGELOG.md

@@ -6,6 +6,17 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
+## Unreleased
+
+### Dependencies
+
+- Bump Android SDK from v8.32.0 to v8.33.0 ([#5684](https://github.com/getsentry/sentry-react-native/pull/5684))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8330)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.32.0...8.33.0)
+- Bump Android SDK Stubs from v8.32.0 to v8.33.0 ([#5697](https://github.com/getsentry/sentry-react-native/pull/5697))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8330)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.32.0...8.33.0)
+
 ## 8.1.0
 
 ### Features

README.md

@@ -24,6 +24,8 @@ This repo uses the following ways to release SDK updates:
 - `Latest`: We continuously release major/minor/hotfix versions from the `main` branch. These releases go through all our internal quality gates and are very safe to use and intended to be the default for most teams.
 - `Stable`: We promote releases from `Latest` when they have been used in the field for some time and in scale, considering time since release, adoption, and other quality and stability metrics. These releases will be indicated on [the releases page](https://github.com/getsentry/sentry-react-native/releases/) with the `Stable` suffix.
 
+For a list of which SDK versions are bundled with each release, see [SDK-VERSIONS.md](SDK-VERSIONS.md).
+
 ## Requirements
 
 - `react-native >= 0.65.0`

SDK-VERSIONS.md

@@ -55,6 +55,6 @@ android {
 dependencies {
     compileOnly files('libs/replay-stubs.jar')
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:8.32.0'
-    debugImplementation 'io.sentry:sentry-spotlight:8.32.0'
+    api 'io.sentry:sentry-android:8.33.0'
+    debugImplementation 'io.sentry:sentry-spotlight:8.33.0'
 }

packages/core/android/build.gradle

@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
 }
 
 dependencies {
-  compileOnly 'io.sentry:sentry:8.32.0'
+  compileOnly 'io.sentry:sentry:8.33.0'
 }

packages/core/android/libs/replay-stubs.jar

@@ -667,7 +667,7 @@ private void initializeAndroidProfiler() {
             tracesFilesDirPath,
             (int) SECONDS.toMicros(1) / profilingTracesHz,
             new SentryFrameMetricsCollector(reactApplicationContext, logger, buildInfo),
-            executorService,
+            () -> executorService,
             logger);
   }
 

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

@@ -18,3 +18,5 @@ yarn install
 yarn lerna version --force-publish --exact --no-git-tag-version --no-push --include-merged-tags --yes "${NEW_VERSION}"
 yarn set-version-samples
 node scripts/version-bump.js
+# Update SDK versions table with the new release
+bash scripts/update-sdk-versions-table.sh

packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+file="$(dirname "$0")/../packages/core/package.json"
+content=$(cat $file)
+regex='"version": *"([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)"'
+if ! [[ $content =~ $regex ]]; then
+    echo "Failed to find the version in $file"
+    exit 1
+fi
+
+case $1 in
+get-version)
+    echo ${BASH_REMATCH[1]}
+    ;;
+get-repo)
+    echo "https://github.com/getsentry/sentry-react-native.git"
+    ;;
+set-version)
+    newValue="\"version\": \"$2\""
+    echo "${content/${BASH_REMATCH[0]}/$newValue}" >$file
+    ;;
+*)
+    echo "Unknown argument $1"
+    exit 1
+    ;;
+esac

scripts/craft-pre-release.sh

@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DOCS_FILE="$SCRIPT_DIR/../SDK-VERSIONS.md"
+
+# Get current versions
+RN_VERSION=$("$SCRIPT_DIR/update-rn-version.sh" get-version)
+ANDROID_VERSION=$("$SCRIPT_DIR/update-android.sh" get-version)
+COCOA_VERSION=$("$SCRIPT_DIR/update-cocoa.sh" get-version)
+JS_VERSION=$("$SCRIPT_DIR/update-javascript.sh" get-version)
+
+echo "Current versions:"
+echo "  React Native SDK: $RN_VERSION"
+echo "  Android SDK: $ANDROID_VERSION"
+echo "  Cocoa SDK: $COCOA_VERSION"
+echo "  JavaScript SDK: $JS_VERSION"
+
+# Create the new row with GitHub release links for all SDKs
+RN_RELEASE_URL="https://github.com/getsentry/sentry-react-native/releases/tag/$RN_VERSION"
+ANDROID_RELEASE_URL="https://github.com/getsentry/sentry-java/releases/tag/$ANDROID_VERSION"
+COCOA_RELEASE_URL="https://github.com/getsentry/sentry-cocoa/releases/tag/$COCOA_VERSION"
+JS_RELEASE_URL="https://github.com/getsentry/sentry-javascript/releases/tag/$JS_VERSION"
+NEW_ROW="| [$RN_VERSION]($RN_RELEASE_URL) | [$ANDROID_VERSION]($ANDROID_RELEASE_URL) | [$COCOA_VERSION]($COCOA_RELEASE_URL) | [$JS_VERSION]($JS_RELEASE_URL) |"
+
+# Check if the docs file exists
+if [ ! -f "$DOCS_FILE" ]; then
+    echo "Creating $DOCS_FILE..."
+    cat > "$DOCS_FILE" << EOF
+# SDK Versions
+
+This page lists which versions of the [Sentry Android SDK](https://github.com/getsentry/sentry-java), [Sentry Cocoa SDK](https://github.com/getsentry/sentry-cocoa), and [Sentry JavaScript SDK](https://github.com/getsentry/sentry-javascript) are bundled with each Sentry React Native SDK release.
+
+## Maintenance
+
+The SDK versions table is automatically updated during each release via the \`craft-pre-release.sh\` script.
+
+To manually update the table with the current version, run \`./scripts/update-sdk-versions-table.sh\` from the repository root directory.
+
+## Versions
+
+| React Native SDK | Android SDK | Cocoa SDK | JavaScript SDK |
+| ---------------- | ----------- | --------- | -------------- |
+$NEW_ROW
+EOF
+    echo "Created $DOCS_FILE with initial version entry"
+else
+    # Check if this version already exists in the first column of the table
+    if grep -qE "^\| \[$RN_VERSION\]\(" "$DOCS_FILE"; then
+        echo "Version $RN_VERSION already exists in the table. Updating it..."
+        # Remove the old version line (anchored to first column) and add the new one at the top
+        grep -vE "^\| \[$RN_VERSION\]\(" "$DOCS_FILE" | \
+        awk -v new_row="$NEW_ROW" '
+            /^\| React Native SDK \|/ {
+                print
+                getline
+                print
+                print new_row
+                next
+            }
+            { print }
+        ' > "$DOCS_FILE.tmp"
+        mv "$DOCS_FILE.tmp" "$DOCS_FILE"
+        echo "Updated version $RN_VERSION in $DOCS_FILE"
+    else
+        echo "Adding new version to $DOCS_FILE..."
+        # Find the header separator line and insert the new row after it
+        awk -v new_row="$NEW_ROW" '
+            BEGIN { added = 0 }
+            /^\| React Native SDK \|/ && added == 0 {
+                print
+                getline
+                print
+                print new_row
+                added = 1
+                next
+            }
+            { print }
+        ' "$DOCS_FILE" > "$DOCS_FILE.tmp"
+        mv "$DOCS_FILE.tmp" "$DOCS_FILE"
+        echo "Added version $RN_VERSION to $DOCS_FILE"
+    fi
+fi
+
+echo "Done!"