Skip to content

Commit c465b24

Browse files
committed
Merge branch 'nitro' into rename-to-nitro-sqlite
2 parents 1be6414 + 935ccf6 commit c465b24

File tree

6 files changed

+36
-9
lines changed

6 files changed

+36
-9
lines changed

bun.lockb

32 Bytes
Binary file not shown.

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react": "18.3.1",
2424
"react-native": "0.75.2",
2525
"react-native-nitro-modules": "^0.13.0",
26-
"react-native-nitro-sqlite": "workspace:*",
26+
"react-native-nitro-sqlite": "8.2.1-nitro.1",
2727
"react-native-safe-area-context": "^4.11.0",
2828
"react-native-screens": "^3.34.0",
2929
"reflect-metadata": "^0.1.13",

package.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"typescript": "bun --filter=\"**\" typescript",
2626
"lint": "bun --filter=\"**\" lint",
2727
"bootstrap": "bun --filter=\"**\" install && bun typescript && bun example pods",
28-
"release": "release-it",
28+
"release": "bun package prepare && release-it",
2929
"clean": "rm -rf **/tsconfig.tsbuildinfo node_modules package/node_module package/lib"
3030
},
3131
"dependencies": {
@@ -87,9 +87,16 @@
8787
}
8888
},
8989
"@release-it/bumper": {
90-
"out": {
91-
"file": "example/package.json"
92-
}
90+
"out": [
91+
{
92+
"file": "example/package.json",
93+
"path": "version"
94+
},
95+
{
96+
"file": "example/package.json",
97+
"path": "dependencies.react-native-quick-sqlite"
98+
}
99+
]
93100
}
94101
}
95102
}

package/android/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ include_directories(
2727
../cpp
2828
../cpp/specs
2929
../cpp/sqlite
30+
src/main/cpp
3031
)
3132

3233
find_library(LOG_LIB log)

package/android/build.gradle

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,26 @@ android {
9292
}
9393
}
9494
}
95+
96+
packagingOptions {
97+
excludes = [
98+
"META-INF",
99+
"META-INF/**",
100+
"**/libc++_shared.so",
101+
"**/libfbjni.so",
102+
"**/libjsi.so",
103+
"**/libfolly_json.so",
104+
"**/libfolly_runtime.so",
105+
"**/libglog.so",
106+
"**/libhermes.so",
107+
"**/libhermes-executor-debug.so",
108+
"**/libhermes_executor.so",
109+
"**/libreactnativejni.so",
110+
"**/libturbomodulejsijni.so",
111+
"**/libreact_nativemodule_core.so",
112+
"**/libjscexecutor.so"
113+
]
114+
}
95115
}
96116

97117
repositories {

package/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
"typescript": "tsc --noEmit",
4747
"lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
4848
"prepare": "rm -rf lib && bun typescript && bob build",
49-
"bootstrap": "bun --filter=\"**\" install && bun tsc && bun --filter=\"example\" pods",
50-
"specs": "bun typescript && bun nitro-codegen --logLevel=\"debug\"",
51-
"release": "bun prepare && release-it"
49+
"specs": "bun typescript && bun nitro-codegen --logLevel=\"debug\""
5250
},
5351
"dependencies": {
5452
"typeorm": "^0.3.20"
@@ -59,7 +57,8 @@
5957
"nitro-codegen": "^0.13.0",
6058
"react": "18.3.1",
6159
"react-native": "0.75.2",
62-
"react-native-builder-bob": "^0.18.2"
60+
"react-native-builder-bob": "^0.18.2",
61+
"react-native-nitro-modules": "*"
6362
},
6463
"peerDependencies": {
6564
"react": "*",

0 commit comments

Comments
 (0)