From 99c8c4e4e01d27353c2db52b1c274cf284685531 Mon Sep 17 00:00:00 2001 From: Dima Date: Wed, 17 Jan 2024 22:44:54 +0700 Subject: [PATCH] Replace DevInternalSettings with DeveloperSettings for react-native 0.73.0 (#2617) * Replace DevInternalSettings with DeveloperSettings DevInternalSettings was enclosed in ReactNative 0.73.0-rc.2, so we need to replace it with public class DeveloperSettings. https://github.com/facebook/react-native/pull/37256 * auto install cocoapods in tests --------- Co-authored-by: velimir-jankovic <84719115+velimir-jankovic@users.noreply.github.com> Co-authored-by: JiglioNero --- .../main/java/com/microsoft/codepush/react/CodePush.java | 8 ++++---- test/test.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java index 923dd1519..4acb84fce 100644 --- a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java +++ b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java @@ -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; @@ -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; } diff --git a/test/test.ts b/test/test.ts index cbe72e15c..daf7ecc31 100644 --- a/test/test.ts +++ b/test/test.ts @@ -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(TestUtil.getProcessOutput.bind(undefined, TestConfig.thisPluginInstallString, { cwd: path.join(projectDirectory, TestConfig.TestAppName) }))