Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Native: add new Node and Electron versions, bump version #1615

Merged
merged 4 commits into from Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Expand Up @@ -46,7 +46,7 @@ jobs:
name: All Electron Builds
strategy:
matrix:
electron: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '2.0', '3.0', '3.1', '4.1', '4.2', '5.0', '6.0', '6.1', '7.0', '7.1', '7.2', '7.3', '8.0', '8.1', '8.2', '8.3', '9.0']
electron: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '2.0', '3.0', '3.1', '4.1', '4.2', '5.0', '6.0', '6.1', '7.0', '7.1', '7.2', '7.3', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '9.0', '9.1', '9.2', '9.3', '10.0', '10.1']
arch: [ia32, x64]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{matrix.os}}
Expand Down
7 changes: 6 additions & 1 deletion packages/grpc-native-core/README.md
@@ -1,13 +1,18 @@
[![npm](https://img.shields.io/npm/v/grpc.svg)](https://www.npmjs.com/package/grpc)
# Node.js gRPC Library

**This library is now only receiving bug fixes and runtime compatibility updates. In April 2021 it will be deprecated and will no longer receive any updates.**
**This library is now only receiving bug fixes and runtime compatibility updates. In April 2021 it will be deprecated and will no longer receive any updates. We recommend using [`@grpc/grpc-js`](https://www.npmjs.com/package/@grpc/grpc-js) instead.**

## PREREQUISITES
- `node`: This requires `node` to be installed, version `4.0` or above. If you instead have the `nodejs` executable on Debian, you should install the [`nodejs-legacy`](https://packages.debian.org/sid/nodejs-legacy) package.

- **Note:** If you installed `node` via a package manager and the version is still less than `4.0`, try directly installing it from [nodejs.org](https://nodejs.org).

## LATEST VERSIONS SUPPORTED

- Node: 14
- Electron: 10.1

## INSTALLATION

Install the gRPC NPM package
Expand Down
4 changes: 2 additions & 2 deletions packages/grpc-native-core/binding.gyp
Expand Up @@ -72,7 +72,7 @@
'-std=c99'
],
'cflags_cc': [
'-std=c++1y'
'-std=c++14'
],
'include_dirs': [
'deps/grpc',
Expand All @@ -91,7 +91,7 @@
'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=1',
'GRPC_UV',
'GRPC_NODE_VERSION="1.24.2"',
'GRPC_NODE_VERSION="1.24.4"',
'CARES_STATICLIB',
'CARES_SYMBOL_HIDING'
],
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/build.yaml
@@ -1,3 +1,3 @@
settings:
'#': It's possible to have node_version here as a key to override the core's version.
node_version: 1.24.2
node_version: 1.24.4
4 changes: 2 additions & 2 deletions packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
{
"name": "grpc",
"version": "1.24.3",
"version": "1.24.4",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "https://grpc.io/",
Expand Down Expand Up @@ -30,7 +30,7 @@
"lodash.camelcase": "^4.3.0",
"lodash.clone": "^4.5.0",
"nan": "^2.13.2",
"node-pre-gyp": "^0.15.0",
"node-pre-gyp": "^0.16.0",
"protobufjs": "^5.0.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/templates/binding.gyp.template
Expand Up @@ -68,7 +68,7 @@
'-std=c99'
],
'cflags_cc': [
'-std=c++1y'
'-std=c++14'
],
'include_dirs': [
'deps/grpc',
Expand Down
5 changes: 1 addition & 4 deletions packages/grpc-native-core/templates/package.json.template
Expand Up @@ -27,15 +27,12 @@
"install": "node-pre-gyp install --fallback-to-build --library=static_library",
"prepack": "git submodule update --init --recursive && npm install"
},
"bundledDependencies": [
"node-pre-gyp"
],
"dependencies": {
"@types/bytebuffer": "^5.0.40",
"lodash.camelcase": "^4.3.0",
"lodash.clone": "^4.5.0",
"nan": "^2.13.2",
"node-pre-gyp": "^0.14.0",
"node-pre-gyp": "^0.16.0",
"protobufjs": "^5.0.3"
},
"devDependencies": {
Expand Down