fix: Use NitroDefines import

mrousavy · Jan 21, 2025 · 9e45c77 · 9e45c77
1 parent 8a78beb
commit 9e45c77
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/NitroImageOnLoad.cpp b/packages/react-native-nitro-image/nitrogen/generated/android/NitroImageOnLoad.cpp
@@ -59,7 +59,7 @@ int initialize(JavaVM* vm) {
     margelo::nitro::image::JHybridBaseSpec::registerNatives();
     margelo::nitro::image::JHybridChildSpec::registerNatives();
     margelo::nitro::image::JHybridTestViewSpec::registerNatives();
-    #if REACT_NATIVE_VERSION >= 78
+    #if REACT_NATIVE_VERSION_MINOR >= 78
     margelo::nitro::image::views::JHybridTestViewStateUpdater::registerNatives();
     #endif
 

diff --git a/...t-native-nitro-image/nitrogen/generated/android/c++/views/JHybridTestViewStateUpdater.cpp b/...t-native-nitro-image/nitrogen/generated/android/c++/views/JHybridTestViewStateUpdater.cpp
@@ -5,9 +5,10 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
-#if REACT_NATIVE_VERSION >= 78
-
 #include "JHybridTestViewStateUpdater.hpp"
+#include <NitroModules/NitroDefines.hpp>
+#if REACT_NATIVE_VERSION_MINOR >= 78
+
 #include "views/HybridTestViewComponent.hpp"
 
 namespace margelo::nitro::image::views {

diff --git a/...t-native-nitro-image/nitrogen/generated/android/c++/views/JHybridTestViewStateUpdater.hpp b/...t-native-nitro-image/nitrogen/generated/android/c++/views/JHybridTestViewStateUpdater.hpp
@@ -7,7 +7,8 @@
 
 #pragma once
 
-#if REACT_NATIVE_VERSION >= 78
+#include <NitroModules/NitroDefines.hpp>
+#if REACT_NATIVE_VERSION_MINOR >= 78
 
 #include <fbjni/fbjni.h>
 #include <react/fabric/StateWrapperImpl.h>

diff --git a/...ages/react-native-nitro-image/nitrogen/generated/ios/c++/views/HybridTestViewComponent.mm b/...ages/react-native-nitro-image/nitrogen/generated/ios/c++/views/HybridTestViewComponent.mm
@@ -5,9 +5,10 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
-#if REACT_NATIVE_VERSION >= 78
-
 #import "HybridTestViewComponent.hpp"
+#include <NitroModules/NitroDefines.hpp>
+#if REACT_NATIVE_VERSION_MINOR >= 78
+
 #import <memory>
 #import <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 #import <React/RCTViewComponentView.h>

diff --git a/.../react-native-nitro-image/nitrogen/generated/shared/c++/views/HybridTestViewComponent.cpp b/.../react-native-nitro-image/nitrogen/generated/shared/c++/views/HybridTestViewComponent.cpp
@@ -5,9 +5,10 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
-#if REACT_NATIVE_VERSION >= 78
-
 #include "HybridTestViewComponent.hpp"
+#include <NitroModules/NitroDefines.hpp>
+#if REACT_NATIVE_VERSION_MINOR >= 78
+
 #include <string>
 #include <exception>
 #include <utility>

diff --git a/.../react-native-nitro-image/nitrogen/generated/shared/c++/views/HybridTestViewComponent.hpp b/.../react-native-nitro-image/nitrogen/generated/shared/c++/views/HybridTestViewComponent.hpp
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#if REACT_NATIVE_VERSION >= 78
+#include <NitroModules/NitroDefines.hpp>
+#if REACT_NATIVE_VERSION_MINOR >= 78
 
 #include <optional>
-#include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/NitroHash.hpp>
 #include <NitroModules/CachedProp.hpp>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
@@ -98,5 +98,5 @@ namespace margelo::nitro::image::views {
 } // namespace margelo::nitro::image::views
 
 #else
-  #warning "View Component 'HybridTestView' will be unavailable in React Native, because it requires React Native 78 or higher."
+#warning "View Component 'HybridTestView' will be unavailable in React Native, because it requires React Native 78 or higher."
 #endif
diff --git a/packages/react-native-nitro-modules/cpp/entrypoint/HybridNitroModulesProxy.hpp b/packages/react-native-nitro-modules/cpp/entrypoint/HybridNitroModulesProxy.hpp
@@ -11,7 +11,6 @@
 #include "HybridObject.hpp"
 #include <memory>
 #include <string>
-#include <cxxreact/ReactNativeVersion.h>
 
 namespace margelo::nitro {