Merge branch 'nitro' into rename-to-nitro-sqlite

margelo · Nov 13, 2024 · 53616e2 · 53616e2
2 parents 8c2789a + 20570b2
commit 53616e2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/package/nitro.json b/package/nitro.json
@@ -3,7 +3,7 @@
     "rnnitrosqlite"
   ],
   "ios": {
-    "iosModulename": "RNNitroSQLite"
+    "iosModuleName": "RNNitroSQLite"
   },
   "android": {
     "androidNamespace": [

diff --git a/package/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake b/package/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake
@@ -43,6 +43,18 @@ target_link_libraries(
         RNNitroSQLite
         fbjni::fbjni                              # <-- Facebook C++ JNI helpers
         ReactAndroid::jsi                         # <-- RN: JSI
-        ReactAndroid::react_nativemodule_core     # <-- RN: TurboModules Core
         react-native-nitro-modules::NitroModules  # <-- NitroModules Core :)
 )
+
+# Link react-native (different prefab between RN 0.75 and RN 0.76)
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+    target_link_libraries(
+        RNNitroSQLite
+        ReactAndroid::reactnative                 # <-- RN: Native Modules umbrella prefab
+    )
+else()
+    target_link_libraries(
+        RNNitroSQLite
+        ReactAndroid::react_nativemodule_core     # <-- RN: TurboModules Core
+    )
+endif()
diff --git a/package/nitrogen/generated/android/RNNitroSQLite+autolinking.gradle b/package/nitrogen/generated/android/RNNitroSQLite+autolinking.gradle
@@ -13,6 +13,8 @@
 /// apply from: '../nitrogen/generated/android/RNNitroSQLite+autolinking.gradle'
 /// ```
 
+logger.warn("[NitroModules] 🔥 RNNitroSQLite is boosted by nitro!")
+
 android {
   sourceSets {
     main {

diff --git a/package/nitrogen/generated/ios/RNNitroSQLite+autolinking.rb b/package/nitrogen/generated/ios/RNNitroSQLite+autolinking.rb
@@ -20,7 +20,7 @@
 # ```
 
 def add_nitrogen_files(spec)
-  Pod::UI.puts "[NitroModules] Adding RNNitroSQLite specs..."
+  Pod::UI.puts "[NitroModules] 🔥 RNNitroSQLite is boosted by nitro!"
 
   spec.dependency "NitroModules"
 

diff --git a/package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp b/package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp
@@ -7,12 +7,6 @@
 
 #pragma once
 
-#if __has_include(<NitroModules/NitroDefines.hpp>)
-#include <NitroModules/NitroDefines.hpp>
-#else
-#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
-#endif
-
 // Forward declarations of C++ defined types