Merge branch 'main' into lz/lint-test

lucas-zimerman · web-flow · commit e211c03a15e3 · 2025-09-29T18:23:51.000+01:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # pin@v3.29.5
+        uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # pin@v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # pin@v3.29.5
+        uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # pin@v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # pin@v3.29.5
+        uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # pin@v3.29.5
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -6,4 +6,4 @@ on:
 
 jobs:
   danger:
-    uses: getsentry/github-workflows/.github/workflows/danger.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/danger.yml@v3
diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   android:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-android.sh
       name: Android SDK
@@ -20,7 +20,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   android-stubs:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-android-stubs.sh
       name: Android SDK Stubs
@@ -29,7 +29,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   cocoa:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-cocoa.sh
       name: Cocoa SDK
@@ -38,7 +38,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   javascript:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-javascript.sh
       name: JavaScript SDK
@@ -47,7 +47,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   wizard:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-wizard.sh
       name: Wizard
@@ -57,7 +57,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   cli:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-cli.sh
       name: CLI
@@ -66,7 +66,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   bundler-plugins:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-bundler-plugins.sh
       name: Bundler Plugins
@@ -75,7 +75,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   sample-rn:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-rn.sh
       name: React Native
@@ -86,7 +86,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   maestro:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-maestro.sh
       name: Maestro
@@ -97,7 +97,7 @@ jobs:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
   sentry-android-gradle-plugin:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v3
     with:
       path: scripts/update-sentry-android-gradle-plugin.sh
       name: Sentry Android Gradle Plugin
diff --git a/CHANGELOG.md b/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 Cocoa SDK from v8.56.1 to v8.56.2 ([#5214](https://github.com/getsentry/sentry-react-native/pull/5214))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8562)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.56.1...8.56.2)
+- 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))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8220)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.21.1...8.22.0)
+
 ## 7.2.0
 
 ### Features
diff --git a/packages/core/RNSentry.podspec b/packages/core/RNSentry.podspec
@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.56.1'
+  s.dependency 'Sentry/HybridSDK', '8.56.2'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)
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.21.1'
+    api 'io.sentry:sentry-android:8.22.0'
 }
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.21.1'
+  compileOnly 'io.sentry:sentry:8.22.0'
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -83,7 +83,7 @@
     "@sentry-internal/eslint-config-sdk": "10.12.0",
     "@sentry-internal/eslint-plugin-sdk": "10.12.0",
     "@sentry-internal/typescript": "10.12.0",
-    "@sentry/wizard": "6.4.0",
+    "@sentry/wizard": "6.5.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",
diff --git a/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts b/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts
@@ -13,7 +13,7 @@ export interface SentryAndroidGradlePluginOptions {
   includeSourceContext?: boolean;
 }
 
-export const sentryAndroidGradlePluginVersion = '5.11.0';
+export const sentryAndroidGradlePluginVersion = '5.12.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
@@ -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:5.11.0")
+        classpath("io.sentry:sentry-android-gradle-plugin:5.12.0")
     }
 }
 
diff --git a/scripts/update-android-stubs.sh b/scripts/update-android-stubs.sh
diff --git a/yarn.lock b/yarn.lock
@@ -9749,7 +9749,7 @@ __metadata:
     "@sentry/core": 10.12.0
     "@sentry/react": 10.12.0
     "@sentry/types": 10.12.0
-    "@sentry/wizard": 6.4.0
+    "@sentry/wizard": 6.5.0
     "@testing-library/react-native": ^12.7.2
     "@types/jest": ^29.5.13
     "@types/node": ^20.9.3
@@ -9832,9 +9832,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/wizard@npm:6.4.0":
-  version: 6.4.0
-  resolution: "@sentry/wizard@npm:6.4.0"
+"@sentry/wizard@npm:6.5.0":
+  version: 6.5.0
+  resolution: "@sentry/wizard@npm:6.5.0"
   dependencies:
     "@clack/prompts": 0.7.0
     "@sentry/node": ^7.119.2
@@ -9852,7 +9852,7 @@ __metadata:
     yargs: ^16.2.0
   bin:
     sentry-wizard: dist/bin.js
-  checksum: b95f76ef04f5c4d135c0ad01b612ab86cdde6f2a1de4c2e1be24539e2f371967a8488c8966fb9a2bde4c63d3ad04250f25efbd458e5bf227f3cb4cb1bec41082
+  checksum: 567da52a3dbdee340a520adf0ea1f77b360e857ffa3de5accd2efe8b661c2c21efa5c200b1d4cff444376c23e8f6d8e25bc2f12b3dbe004c631cb20afdd16f32
   languageName: node
   linkType: hard
 

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.21.1'`
	`58`	`+ api 'io.sentry:sentry-android:8.22.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.21.1'`
	`21`	`+ compileOnly 'io.sentry:sentry:8.22.0'`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export interface SentryAndroidGradlePluginOptions {`
`13`	`13`	`includeSourceContext?: boolean;`
`14`	`14`	`}`
`15`	`15`
`16`		`-export const sentryAndroidGradlePluginVersion = '5.11.0';`
	`16`	`+export const sentryAndroidGradlePluginVersion = '5.12.0';`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* Adds the Sentry Android Gradle Plugin to the project.`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ buildscript {`
`16`	`16`	`classpath("com.android.tools.build:gradle")`
`17`	`17`	`classpath("com.facebook.react:react-native-gradle-plugin")`
`18`	`18`	`classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")`
`19`		`- classpath("io.sentry:sentry-android-gradle-plugin:5.11.0")`
	`19`	`+ classpath("io.sentry:sentry-android-gradle-plugin:5.12.0")`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`