From 27e1c9f362b47791de44301099884a7c6f68d107 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Mon, 13 Jan 2025 14:23:42 +0100 Subject: [PATCH] fix: Better warning --- .../android/src/main/cpp/registry/JHybridObjectRegistry.hpp | 2 +- .../java/com/margelo/nitro/core/HybridObjectInitializer.java | 4 ++++ .../java/com/margelo/nitro/core/HybridObjectRegistry.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/react-native-nitro-modules/android/src/main/cpp/registry/JHybridObjectRegistry.hpp b/packages/react-native-nitro-modules/android/src/main/cpp/registry/JHybridObjectRegistry.hpp index e635ba741..8bcebb9d1 100644 --- a/packages/react-native-nitro-modules/android/src/main/cpp/registry/JHybridObjectRegistry.hpp +++ b/packages/react-native-nitro-modules/android/src/main/cpp/registry/JHybridObjectRegistry.hpp @@ -21,7 +21,7 @@ struct JHybridObjectRegistry : public jni::JavaClass { public: [[deprecated("HybridObjects should be registered from C++ instead. Either autolink them using `nitro.json`, " - "or add them manually in HybridObjectRegistry.")]] + "or add them manually in the C++ HybridObjectRegistry.")]] static void registerHybridObjectConstructor(jni::alias_ref clazz, std::string hybridObjectName, jni::alias_ref constructorFn); diff --git a/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectInitializer.java b/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectInitializer.java index c92b4a493..7e777ba20 100644 --- a/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectInitializer.java +++ b/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectInitializer.java @@ -4,8 +4,12 @@ import com.facebook.proguard.annotations.DoNotStrip; +/** + * @deprecated HybridObjects should be registered from C++ instead. Either autolink them using `nitro.json`, or add them manually in the C++ `HybridObjectRegistry`. + */ @Keep @DoNotStrip +@Deprecated(forRemoval = true) public interface HybridObjectInitializer { @Keep @DoNotStrip diff --git a/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectRegistry.java b/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectRegistry.java index fb5e80a16..16744b4b0 100644 --- a/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectRegistry.java +++ b/packages/react-native-nitro-modules/android/src/main/java/com/margelo/nitro/core/HybridObjectRegistry.java @@ -20,7 +20,7 @@ public class HybridObjectRegistry { * Registers the given HybridObject in the `HybridObjectRegistry`. * It will be uniquely identified via it's `hybridObjectName`, and can be initialized from * JS using `NitroModules.createHybridObject(name)` - which will call the `constructorFn` here. - * @deprecated HybridObjects should be registered from C++ instead. Either autolink them using `nitro.json`, or add them manually in HybridObjectRegistry. + * @deprecated HybridObjects should be registered from C++ instead. Either autolink them using `nitro.json`, or add them manually in the C++ `HybridObjectRegistry`. */ @Deprecated(forRemoval = true) public static native void registerHybridObjectConstructor(String hybridObjectName, HybridObjectInitializer initializer);