Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ios): handle isDebuggingRemotely being removed in 0.79 #2380

Merged
merged 3 commits into from
Feb 4, 2025
Merged

fix(ios): handle isDebuggingRemotely being removed in 0.79 #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
641146e
fix(ios): handle `isDebuggingRemotely` being removed in 0.79
tido64 Jan 30, 2025
65e2286
fixup! fix(ios): handle `isDebuggingRemotely` being removed in 0.79
tido64 Jan 30, 2025
6e35b55
fixup! fix(ios): handle `isDebuggingRemotely` being removed in 0.79
tido64 Jan 30, 2025
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
2 changes: 0 additions & 2 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
android:usesCleartextTraffic="true"
tools:targetApi="m"
>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

<activity android:name="com.microsoft.reacttestapp.MainActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
2 changes: 2 additions & 0 deletions ios/ReactTestApp/React+Compatibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ NS_ASSUME_NONNULL_BEGIN

NSURL *RTADefaultJSBundleURL();

void RTADisableRemoteDebugging();

IMP RTASwizzleSelector(Class class, SEL originalSelector, SEL swizzledSelector);

NS_ASSUME_NONNULL_END
14 changes: 14 additions & 0 deletions ios/ReactTestApp/React+Compatibility.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

#define MAKE_VERSION(maj, min, patch) ((maj * 1000000) + (min * 1000) + patch)

#if REACT_NATIVE_VERSION < MAKE_VERSION(0, 79, 0)
#import <React/RCTDevSettings.h>
#endif

IMP RTASwizzleSelector(Class class, SEL originalSelector, SEL swizzledSelector)
{
Method originalMethod = class_getInstanceMethod(class, originalSelector);
Expand All @@ -33,6 +37,16 @@ IMP RTASwizzleSelector(Class class, SEL originalSelector, SEL swizzledSelector)
return originalImpl;
}

// MARK: - [0.79.0] `isDebuggingRemotely` was removed
// See https://github.com/facebook/react-native/commit/9aae84a688b5af87faf4b68676b6357de26f797f

void RTADisableRemoteDebugging()
{
#if REACT_NATIVE_VERSION < MAKE_VERSION(0, 79, 0)
[[RCTDevSettings alloc] init].isDebuggingRemotely = NO;
#endif
}

// MARK: - [0.71.13] The additional `inlineSourceMap:` was added in 0.71.13
// See https://github.com/facebook/react-native/commit/f7219ec02d71d2f0f6c71af4d5c3d4850a898fd8

Expand Down
2 changes: 1 addition & 1 deletion ios/ReactTestApp/ReactInstance.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ final class ReactInstance: NSObject, RNXHostConfig {
// When loading the embedded bundle, we must disable remote
// debugging to prevent the bridge from getting stuck in
// -[RCTWebSocketExecutor executeApplicationScript:sourceURL:onComplete:]
RCTDevSettings().isDebuggingRemotely = false
RTADisableRemoteDebugging()
}
RCTTriggerReloadCommandListeners("ReactTestApp")
return
Expand Down
Loading