Merge pull request #2173 from bugsnag/gingerbenw/catchup-next-16-07

Catchup integration branch to next
bugsnag · Jul 17, 2024 · 41f20f8 · 41f20f8
2 parents b8ac17f + 9f20e16
commit 41f20f8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/.buildkite/basic/react-native-android-pipeline.yml b/.buildkite/basic/react-native-android-pipeline.yml
@@ -67,6 +67,7 @@ steps:
               - --app=/app/features/fixtures/generated/old-arch/{{matrix}}/reactnative.apk
               - --farm=bb
               - --device=ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -99,6 +100,7 @@ steps:
               - --app=/app/features/fixtures/generated/new-arch/{{matrix}}/reactnative.apk
               - --farm=bb
               - --device=ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel

diff --git a/.buildkite/full/react-native-android-pipeline.full.yml b/.buildkite/full/react-native-android-pipeline.full.yml
@@ -235,6 +235,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -262,6 +263,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -290,6 +292,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -318,6 +321,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -346,6 +350,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -374,6 +379,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -402,6 +408,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -430,6 +437,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -458,6 +466,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel
@@ -484,6 +493,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --fail-fast
               - --no-tunnel

diff --git a/.buildkite/full/react-native-cli-pipeline.full.yml b/.buildkite/full/react-native-cli-pipeline.full.yml
@@ -220,6 +220,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --no-tunnel
               - --aws-public-ip
@@ -245,6 +246,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --no-tunnel
               - --aws-public-ip
@@ -270,6 +272,7 @@ steps:
               - --app-package=com.reactnative
               - --farm=bb
               - --device=ANDROID_10|ANDROID_11|ANDROID_12
+              - --appium-version=1.22
               - --a11y-locator
               - --no-tunnel
               - --aws-public-ip

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,20 +16,21 @@
 - (plugin-network-breadcrumbs, plugin-electron-net-breadcrumbs) Added `duration` metadata field to network breadcrumbs [#1903](https://github.com/bugsnag/bugsnag-js/pull/1903)
 - (react-native) Update bugsnag-android from v5.32.2 to [v6.4.0](https://github.com/bugsnag/bugsnag-android/blob/v6.4.0/CHANGELOG.md#640-2024-04-15)
 
-## [Unreleased]
+## [7.25.0] - 2024-07-03
+
+### Added
+
+- (core) Add new `setTraceCorrelation` method to events [#2159](https://github.com/bugsnag/bugsnag-js/pull/2159)
 
 ### Changed
 
 - (react-native) Update bugsnag-cocoa from v6.28.1 to [v6.29.0](https://github.com/bugsnag/bugsnag-cocoa/blob/master/CHANGELOG.md#6290-2024-06-19)
 - (react-native) Update bugsnag-android from v5.32.2 to [v5.32.3](https://github.com/bugsnag/bugsnag-android/blob/v5.32.3/CHANGELOG.md#5323-2024-06-27)
 
-### Added
-
-- (core) Add new `setTraceCorrelation` method to events [#2159](https://github.com/bugsnag/bugsnag-js/pull/2159)
-
 ### Fixed
 
 - (react-native) Use synchronous native module calls when New Architecture is enabled [#2152](https://github.com/bugsnag/bugsnag-js/pull/2152)
+- (react-native) Ensure client is initialised synchronously in bridgeless mode [#2165](https://github.com/bugsnag/bugsnag-js/pull/2165)
 
 ## [7.24.0] - 2024-06-10
 

diff --git a/packages/react-native/src/notifier.js b/packages/react-native/src/notifier.js
@@ -9,9 +9,9 @@ This only affects the remote debugger. Execution of JS in the normal way (on the
 
 // this is how some internal react native code detects whether the app is running
 // in the remote debugger:
-//   https://github.com/facebook/react-native/blob/1f4535c17572df78e2a033890220337e5703b614/Libraries/ReactNative/PaperUIManager.js#L62-L66
+//   https://github.com/facebook/react-native/blob/e320ab47cf855f2e5de74ea448ec292cf0bbb29a/packages/react-native/Libraries/Utilities/DebugEnvironment.js#L15
 // there's no public api for this so we use the same approach
-const isDebuggingRemotely = !global.nativeCallSyncHook
+const isDebuggingRemotely = !global.nativeCallSyncHook && !global.RN$Bridgeless
 
 const name = 'Bugsnag React Native'
 const { version } = require('../package.json')