From 651e0a1b469425db4362ab1bf17260d6a726dbce Mon Sep 17 00:00:00 2001 From: Andrei Shikov Date: Mon, 28 Feb 2022 08:37:08 -0800 Subject: [PATCH] Update usages of default ReactNativeConfig Summary: Fixes compilation of Android template and renames the field according to Java guidelines. Changelog: [Android][Changed] - Rename field with default values for ReactConfig to DEFAULT_CONFIG Differential Revision: D34523356 fbshipit-source-id: 05bafae334083e8b0c0748e2c72a56d295b8db90 --- .../main/java/com/facebook/react/fabric/ReactNativeConfig.java | 2 +- .../java/com/facebook/react/uiapp/RNTesterApplication.java | 2 +- .../newarchitecture/MainApplicationReactNativeHost.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java index 9309b114a8415b..1c6704b3d88db7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java @@ -23,7 +23,7 @@ @DoNotStrip public interface ReactNativeConfig { - public final ReactNativeConfig DefaultValuesReactNativeConfig = new EmptyReactNativeConfig(); + ReactNativeConfig DEFAULT_CONFIG = new EmptyReactNativeConfig(); /** * Get a boolean param by string name. Default should be false. diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java index fe85e07adb8d38..12d2825968a144 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java @@ -171,7 +171,7 @@ public JSIModuleProvider getJSIModuleProvider() { return new FabricJSIModuleProvider( reactApplicationContext, componentFactory, - ReactNativeConfig.DefaultValuesReactNativeConfig, + ReactNativeConfig.DEFAULT_CONFIG, viewManagerRegistry); } }); diff --git a/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java b/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java index a0d5eb650498b1..55473c3f439377 100644 --- a/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java +++ b/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java @@ -17,6 +17,7 @@ import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.fabric.CoreComponentsRegistry; import com.facebook.react.fabric.FabricJSIModuleProvider; +import com.facebook.react.fabric.ReactNativeConfig; import com.facebook.react.uimanager.ViewManagerRegistry; import com.helloworld.BuildConfig; import com.helloworld.newarchitecture.components.MainComponentsRegistry; @@ -104,7 +105,7 @@ public JSIModuleProvider getJSIModuleProvider() { return new FabricJSIModuleProvider( reactApplicationContext, componentFactory, - ReactNativeConfig.DefaultValuesReactNativeConfig, + ReactNativeConfig.DEFAULT_CONFIG, viewManagerRegistry); } });