Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Replace DevInternalSettings with DeveloperSettings for react-native 0.73.0 #2617

Merged
merged 4 commits into from
Jan 17, 2024
Merged

Replace DevInternalSettings with DeveloperSettings for react-native 0.73.0 #2617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af7b9ab
Replace DevInternalSettings with DeveloperSettings
DmitriyKirakosyan Nov 9, 2023
9f00916
Merge branch 'master' into support-rn-0.73
velimir-jankovic Dec 14, 2023
d44049a
Merge branch 'master' into support-rn-0.73
DmitriyKirakosyan Jan 16, 2024
b71171a
auto install cocoapods in tests
MikhailSuendukov Jan 17, 2024
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
8 changes: 4 additions & 4 deletions android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.facebook.react.bridge.JavaScriptModule;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.devsupport.DevInternalSettings;
import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
import com.facebook.react.uimanager.ViewManager;

import org.json.JSONException;
Expand Down Expand Up @@ -152,12 +152,12 @@ private boolean isLiveReloadEnabled(ReactInstanceManager instanceManager) {
if (instanceManager != null) {
DevSupportManager devSupportManager = instanceManager.getDevSupportManager();
if (devSupportManager != null) {
DevInternalSettings devInternalSettings = (DevInternalSettings)devSupportManager.getDevSettings();
Method[] methods = devInternalSettings.getClass().getMethods();
DeveloperSettings devSettings = devSupportManager.getDevSettings();
Method[] methods = devSettings.getClass().getMethods();
for (Method m : methods) {
if (m.getName().equals("isReloadOnJSChangeEnabled")) {
try {
return (boolean) m.invoke(devInternalSettings);
return (boolean) m.invoke(devSettings);
} catch (Exception x) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion test/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ class RNProjectManager extends ProjectManager {
}
mkdirp.sync(projectDirectory);

return TestUtil.getProcessOutput("npx react-native init " + appName + " --version 0.71.3", { cwd: projectDirectory, timeout: 30 * 60 * 1000 })
return TestUtil.getProcessOutput("npx react-native init " + appName + " --version 0.71.3 --install-pods", { cwd: projectDirectory, timeout: 30 * 60 * 1000 })
.then((e) => { console.log(`"npx react-native init ${appName}" success. cwd=${projectDirectory}`); return e; })
.then(this.copyTemplate.bind(this, templatePath, projectDirectory))
.then<void>(TestUtil.getProcessOutput.bind(undefined, TestConfig.thisPluginInstallString, { cwd: path.join(projectDirectory, TestConfig.TestAppName) }))
Expand Down