Skip to content

Commit 18b8f34

Browse files
committed
Merge branch 'main' into feat/use-nitro-null-types
2 parents 18d16f2 + 1103c2e commit 18b8f34

32 files changed

+15
-1428
lines changed

bun.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PODS:
88
- hermes-engine (0.82.1):
99
- hermes-engine/Pre-built (= 0.82.1)
1010
- hermes-engine/Pre-built (0.82.1)
11-
- NitroModules (0.32.0):
11+
- NitroModules (0.33.5):
1212
- boost
1313
- DoubleConversion
1414
- fast_float
@@ -2778,7 +2778,7 @@ SPEC CHECKSUMS:
27782778
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
27792779
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
27802780
hermes-engine: 273e30e7fb618279934b0b95ffab60ecedb7acf5
2781-
NitroModules: 5ab248c0c4bc0a440414c0a8509dbad55cc7da6c
2781+
NitroModules: 78cfd138f35ece84a44111dfecda5a8d5ab5d154
27822782
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
27832783
RCTDeprecation: f17e2ebc07876ca9ab8eb6e4b0a4e4647497ae3a
27842784
RCTRequired: e2c574c1b45231f7efb0834936bd609d75072b63

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"patch-package": "^8.0.0",
3636
"react": "19.1.1",
3737
"react-native": "0.82.1",
38-
"react-native-nitro-modules": "0.32.0"
38+
"react-native-nitro-modules": "0.33.5"
3939
},
4040
"devDependencies": {
4141
"@babel/core": "^7.28.5",
@@ -62,7 +62,7 @@
6262
"eslint-config-prettier": "^10.1.8",
6363
"eslint-plugin-prettier": "^5.5.4",
6464
"jest": "^30.2.0",
65-
"nitrogen": "0.32.0",
65+
"nitrogen": "0.33.5",
6666
"prettier": "^3.6.2",
6767
"release-it": "^17.10.0",
6868
"typeorm": "0.3.27",

package/cpp/types.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using namespace margelo::nitro::rnnitrosqlite;
1010

1111
namespace margelo::rnnitrosqlite {
1212

13-
using SQLiteValue = std::variant<nitro::NullType, bool, std::shared_ptr<ArrayBuffer>, std::string, double>;
13+
using SQLiteValue = std::variant<bool, std::shared_ptr<ArrayBuffer>, std::string, double, SQLiteNullValue>;
1414
using SQLiteQueryParams = std::vector<SQLiteValue>;
1515
using SQLiteQueryResultRow = std::unordered_map<std::string, SQLiteValue>;
1616
using SQLiteQueryResults = std::vector<SQLiteQueryResultRow>;

package/nitrogen/generated/.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

package/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake

Lines changed: 0 additions & 83 deletions
This file was deleted.

package/nitrogen/generated/android/RNNitroSQLite+autolinking.gradle

Lines changed: 0 additions & 27 deletions
This file was deleted.

package/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp

Lines changed: 0 additions & 54 deletions
This file was deleted.

package/nitrogen/generated/android/RNNitroSQLiteOnLoad.hpp

Lines changed: 0 additions & 25 deletions
This file was deleted.

package/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.cpp

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)