Skip to content

Commit 34d6283

Browse files
kewdekewde
committed
Merge branch 'mohd-akram-napi'
2 parents 1752f42 + cc4b598 commit 34d6283

17 files changed

+999
-1132
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ test/nw/app.nw
2424
local.env
2525
.mason
2626
.eslintrc.js
27-
setup.sh
27+
setup.sh
28+
/build-tmp-napi-v3

‎.travis.yml‎

Lines changed: 22 additions & 195 deletions
Original file line numberDiff line numberDiff line change
@@ -21,84 +21,38 @@ matrix:
2121
- os: linux
2222
dist: trusty
2323
compiler: clang
24-
env: NODE_VERSION="13"
24+
env: NODE_VERSION="14"
2525
addons:
2626
apt:
2727
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
2828
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
2929
- os: linux
3030
dist: trusty
3131
compiler: clang
32-
env: NODE_VERSION="12"
32+
env: NODE_VERSION="13"
3333
addons:
3434
apt:
3535
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
3636
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
3737
- os: linux
38+
dist: trusty
3839
compiler: clang
39-
env: NODE_VERSION="11"
40+
env: NODE_VERSION="12"
4041
addons:
4142
apt:
4243
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
4344
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
4445
- os: linux
4546
compiler: clang
46-
env: NODE_VERSION="10"
47+
env: NODE_VERSION="11"
4748
addons:
4849
apt:
4950
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
5051
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
51-
- os: linux
52-
compiler: clang
53-
env: NODE_VERSION="9"
54-
addons:
55-
apt:
56-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
57-
packages: [ 'clang-3.5']
58-
- os: linux
59-
compiler: clang
60-
env: NODE_VERSION="8"
61-
addons:
62-
apt:
63-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
64-
packages: [ 'clang-3.5']
65-
- os: linux
66-
compiler: clang
67-
env: NODE_VERSION="7"
68-
addons:
69-
apt:
70-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
71-
packages: [ 'clang-3.5']
72-
- os: linux
73-
compiler: clang
74-
env: NODE_VERSION="6"
75-
addons:
76-
apt:
77-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
78-
packages: [ 'clang-3.5']
79-
- os: linux
80-
compiler: clang
81-
env: NODE_VERSION="5"
82-
addons:
83-
apt:
84-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
85-
packages: [ 'clang-3.5']
86-
- os: linux
87-
compiler: clang
88-
env: NODE_VERSION="4"
89-
addons:
90-
apt:
91-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
92-
packages: [ 'clang-3.5']
93-
# test building against external sqlite
94-
- os: linux
95-
compiler: clang
96-
env: NODE_VERSION="8" EXTERNAL_SQLITE=true PUBLISHABLE=false
97-
addons:
98-
apt:
99-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
100-
packages: [ 'clang-3.5','libsqlite3-dev']
10152
# OS X
53+
- os: osx
54+
compiler: clang
55+
env: NODE_VERSION="14" # node abi 83
10256
- os: osx
10357
compiler: clang
10458
env: NODE_VERSION="13" # node abi 79
@@ -108,212 +62,85 @@ matrix:
10862
- os: osx
10963
compiler: clang
11064
env: NODE_VERSION="11" # node abi 67
111-
- os: osx
112-
compiler: clang
113-
env: NODE_VERSION="10" # node abi 64
114-
- os: osx
115-
compiler: clang
116-
env: NODE_VERSION="9" # node abi 59
117-
- os: osx
118-
compiler: clang
119-
env: NODE_VERSION="8" # node abi 57
120-
- os: osx
121-
compiler: clang
122-
env: NODE_VERSION="7" # node abi 51
123-
- os: osx
124-
compiler: clang
125-
env: NODE_VERSION="6" # node abi 48
126-
- os: osx
127-
compiler: clang
128-
env: NODE_VERSION="5" # node abi 47
129-
- os: osx
130-
compiler: clang
131-
env: NODE_VERSION="4" # node abi 46
13265
# electron Linux
13366
- os: linux
13467
compiler: clang
135-
env: NODE_VERSION="8" ELECTRON_VERSION="8.2.0"
68+
env: NODE_VERSION="12" ELECTRON_VERSION="8.2.0"
13669
dist: trusty
13770
addons:
13871
apt:
13972
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
14073
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
14174
- os: linux
14275
compiler: clang
143-
env: NODE_VERSION="8" ELECTRON_VERSION="8.1.0"
76+
env: NODE_VERSION="12" ELECTRON_VERSION="8.1.0"
14477
dist: trusty
14578
addons:
14679
apt:
14780
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
14881
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
14982
- os: linux
15083
compiler: clang
151-
env: NODE_VERSION="8" ELECTRON_VERSION="8.0.0"
84+
env: NODE_VERSION="12" ELECTRON_VERSION="8.0.0"
15285
dist: trusty
15386
addons:
15487
apt:
15588
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
15689
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
15790
- os: linux
15891
compiler: clang
159-
env: NODE_VERSION="8" ELECTRON_VERSION="7.1.0"
92+
env: NODE_VERSION="12" ELECTRON_VERSION="7.1.0"
16093
dist: trusty
16194
addons:
16295
apt:
16396
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
16497
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
16598
- os: linux
16699
compiler: clang
167-
env: NODE_VERSION="8" ELECTRON_VERSION="7.0.0"
100+
env: NODE_VERSION="12" ELECTRON_VERSION="7.0.0"
168101
dist: trusty
169102
addons:
170103
apt:
171104
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
172105
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
173106
- os: linux
174107
compiler: clang
175-
env: NODE_VERSION="6" ELECTRON_VERSION="6.1.0"
108+
env: NODE_VERSION="12" ELECTRON_VERSION="6.1.0"
176109
dist: trusty
177110
addons:
178111
apt:
179112
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
180113
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
181114
- os: linux
182115
compiler: clang
183-
env: NODE_VERSION="6" ELECTRON_VERSION="6.0.0"
116+
env: NODE_VERSION="12" ELECTRON_VERSION="6.0.0"
184117
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
185118
addons:
186119
apt:
187120
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
188121
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
189-
- os: linux
190-
compiler: clang
191-
env: NODE_VERSION="6" ELECTRON_VERSION="5.0.0"
192-
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
193-
addons:
194-
apt:
195-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
196-
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
197-
- os: linux
198-
compiler: clang
199-
env: NODE_VERSION="6" ELECTRON_VERSION="4.2.0"
200-
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
201-
addons:
202-
apt:
203-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
204-
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
205-
- os: linux
206-
compiler: clang
207-
env: NODE_VERSION="6" ELECTRON_VERSION="4.1.0"
208-
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
209-
addons:
210-
apt:
211-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
212-
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
213-
- os: linux
214-
compiler: clang
215-
env: NODE_VERSION="6" ELECTRON_VERSION="4.0.0"
216-
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
217-
addons:
218-
apt:
219-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
220-
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
221-
- os: linux
222-
compiler: clang
223-
env: NODE_VERSION="6" ELECTRON_VERSION="3.0.6"
224-
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
225-
addons:
226-
apt:
227-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
228-
packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
229-
- os: linux
230-
compiler: clang
231-
env: NODE_VERSION="6" ELECTRON_VERSION="2.0.1"
232-
dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise
233-
addons:
234-
apt:
235-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
236-
packages: [ 'clang-3.5', 'libc6']
237-
- os: linux
238-
compiler: clang
239-
env: NODE_VERSION="6" ELECTRON_VERSION="1.8.4"
240-
addons:
241-
apt:
242-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
243-
packages: [ 'clang-3.5']
244-
- os: linux
245-
compiler: clang
246-
env: NODE_VERSION="6" ELECTRON_VERSION="1.7.12"
247-
addons:
248-
apt:
249-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
250-
packages: [ 'clang-3.5']
251-
- os: linux
252-
compiler: clang
253-
env: NODE_VERSION="6" ELECTRON_VERSION="1.6.2"
254-
addons:
255-
apt:
256-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
257-
packages: [ 'clang-3.5']
258-
- os: linux
259-
compiler: clang
260-
env: NODE_VERSION="6" ELECTRON_VERSION="1.3.14"
261-
addons:
262-
apt:
263-
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
264-
packages: [ 'clang-3.5']
265122
# electron MacOs
266123
- os: osx
267124
compiler: clang
268-
env: NODE_VERSION="8" ELECTRON_VERSION="8.2.0"
269-
- os: osx
270-
compiler: clang
271-
env: NODE_VERSION="8" ELECTRON_VERSION="8.1.0"
272-
- os: osx
273-
compiler: clang
274-
env: NODE_VERSION="8" ELECTRON_VERSION="8.0.0"
275-
- os: osx
276-
compiler: clang
277-
env: NODE_VERSION="8" ELECTRON_VERSION="7.1.0"
278-
- os: osx
279-
compiler: clang
280-
env: NODE_VERSION="8" ELECTRON_VERSION="7.0.0"
281-
- os: osx
282-
compiler: clang
283-
env: NODE_VERSION="6" ELECTRON_VERSION="6.1.0"
284-
- os: osx
285-
compiler: clang
286-
env: NODE_VERSION="6" ELECTRON_VERSION="6.0.0"
287-
- os: osx
288-
compiler: clang
289-
env: NODE_VERSION="6" ELECTRON_VERSION="5.0.0"
290-
- os: osx
291-
compiler: clang
292-
env: NODE_VERSION="6" ELECTRON_VERSION="4.2.0"
293-
- os: osx
294-
compiler: clang
295-
env: NODE_VERSION="6" ELECTRON_VERSION="4.1.0"
296-
- os: osx
297-
compiler: clang
298-
env: NODE_VERSION="6" ELECTRON_VERSION="4.0.0"
125+
env: NODE_VERSION="12" ELECTRON_VERSION="8.2.0"
299126
- os: osx
300127
compiler: clang
301-
env: NODE_VERSION="6" ELECTRON_VERSION="3.0.6"
128+
env: NODE_VERSION="12" ELECTRON_VERSION="8.1.0"
302129
- os: osx
303130
compiler: clang
304-
env: NODE_VERSION="6" ELECTRON_VERSION="2.0.1"
131+
env: NODE_VERSION="12" ELECTRON_VERSION="8.0.0"
305132
- os: osx
306133
compiler: clang
307-
env: NODE_VERSION="6" ELECTRON_VERSION="1.8.4"
134+
env: NODE_VERSION="12" ELECTRON_VERSION="7.1.0"
308135
- os: osx
309136
compiler: clang
310-
env: NODE_VERSION="6" ELECTRON_VERSION="1.7.12"
137+
env: NODE_VERSION="12" ELECTRON_VERSION="7.0.0"
311138
- os: osx
312139
compiler: clang
313-
env: NODE_VERSION="6" ELECTRON_VERSION="1.6.2"
140+
env: NODE_VERSION="12" ELECTRON_VERSION="6.1.0"
314141
- os: osx
315142
compiler: clang
316-
env: NODE_VERSION="6" ELECTRON_VERSION="1.3.14"
143+
env: NODE_VERSION="12" ELECTRON_VERSION="6.0.0"
317144

318145
env:
319146
global:

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ Asynchronous, non-blocking [SQLite3](https://sqlite.org/) bindings for [Node.js]
77
[![Coverage Status](https://coveralls.io/repos/mapbox/node-sqlite3/badge.svg?branch=master&service=github)](https://coveralls.io/github/mapbox/node-sqlite3?branch=master)
88
[![Dependencies](https://david-dm.org/mapbox/node-sqlite3.svg)](https://david-dm.org/mapbox/node-sqlite3)
99
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fnode-sqlite3.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fnode-sqlite3?ref=badge_shield)
10+
[![N-API v3 Badge](https://img.shields.io/badge/N--API-v3-green.svg)](https://nodejs.org/dist/latest/docs/api/n-api.html#n_api_n_api)
1011

1112
## Supported platforms
1213

1314
The `sqlite3` module works with:
14-
* Node.js v4.x, v6.x, v8.x, v10.x, v11.x, v12.x and v13.x.
15-
* Electron v1.3.X, v1.6.x, v1.7.x, v1.8.x, v2.0.x, v3.0.x, v4.0.x, v4.1.x, v4.2.x, v5.0.x, v6.0.x, v6.1.x, v7.0.x, v7.1.x, v8.0.x, v8.1.x and v8.2.x
15+
* Node.js v11.x, v12.x, v13.x and v14.x.
16+
* Electron v6.0.x, v6.1.x, v7.0.x, v7.1.x, v8.0.x, v8.1.x and v8.2.x
1617

1718
Binaries for most Node versions and platforms are provided by default via [node-pre-gyp](https://github.com/mapbox/node-pre-gyp).
1819

0 commit comments

Comments
 (0)