From bdcc1fac53e28a8fe398d3641e1f8679e6e5adfe Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 3 Nov 2016 10:07:06 +0100 Subject: [PATCH] Async Crypto Endeavour (#36) --- .gitignore | 1 - .travis.yml | 24 ++++++++++++++++++------ README.md | 4 ++++ package.json | 31 +++++++++++++++++-------------- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 3f6f957..eb09573 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,3 @@ node_modules # Aegir builds dist -lib diff --git a/.travis.yml b/.travis.yml index e1d6320..4fe6550 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,15 @@ sudo: false language: node_js -node_js: - - 4 - - 5 +matrix: + include: + - node_js: 4 + env: CXX=g++-4.8 + - node_js: 6 + env: + - SAUCE=true + - CXX=g++-4.8 + - node_js: stable + env: CXX=g++-4.8 # Make sure we have new NPM. before_install: @@ -13,12 +20,17 @@ script: - npm test - npm run coverage -addons: - firefox: 'latest' - before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start after_success: - npm run coverage-publish + +addons: + firefox: 'latest' + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 \ No newline at end of file diff --git a/README.md b/README.md index db10a71..8a5e378 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,10 @@ js-libp2p-spdy [![Travis CI](https://travis-ci.org/libp2p/js-libp2p-spdy.svg?branch=master)](https://travis-ci.org/libp2p/js-libp2p-spdy) [![Circle CI](https://circleci.com/gh/libp2p/js-libp2p-spdy.svg?style=svg)](https://circleci.com/gh/libp2p/js-libp2p-spdy) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) +![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square) +![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square) + +[![Sauce Test Status](https://saucelabs.com/browser-matrix/libp2p-js-spdy.svg)](https://saucelabs.com/u/libp2p-js-spdy) > SPDY 3.1 implementation wrapper that is compatible with libp2p Stream Muxer expected interface diff --git a/package.json b/package.json index 2404020..310ea17 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "name": "libp2p-spdy", "version": "0.9.0", "description": "SPDY 3.1 implementation wrapper that is compatible with libp2p Stream Muxer expected interface", - "main": "lib/index.js", - "jsnext:main": "src/index.js", + "main": "src/index.js", "scripts": { "lint": "gulp lint", "build": "gulp build", @@ -36,28 +35,32 @@ "browser": { "zlib": "browserify-zlib" }, + "engines": { + "node": ">=4.0.0" + }, "devDependencies": { - "aegir": "^8.0.1", + "aegir": "^9.0.1", "chai": "^3.5.0", - "interface-stream-muxer": "^0.4.0", - "libp2p-tcp": "^0.8.0", - "libp2p-websockets": "^0.8.0", - "multiaddr": "^2.0.0", - "pre-commit": "^1.1.2", + "gulp": "^3.9.1", + "interface-stream-muxer": "^0.5.0", + "libp2p-tcp": "^0.9.1", + "libp2p-websockets": "^0.9.0", + "multiaddr": "^2.0.3", + "pre-commit": "^1.1.3", "pull-file": "^1.0.0", "pull-pair": "^1.1.0", - "pull-stream": "^3.4.3", + "pull-stream": "^3.5.0", "run-parallel": "^1.1.6", "tap-spec": "^4.1.1", - "tape": "^4.2.0" + "tape": "^4.6.2" }, "dependencies": { "browserify-zlib": "github:ipfs/browserify-zlib", - "interface-connection": "^0.2.1", + "interface-connection": "^0.3.0", "lodash.noop": "^3.0.1", - "pull-stream-to-stream": "^1.3.1", - "spdy-transport": "^2.0.14", - "stream-to-pull-stream": "^1.7.0" + "pull-stream-to-stream": "^1.3.3", + "spdy-transport": "^2.0.17", + "stream-to-pull-stream": "^1.7.2" }, "contributors": [ "David Dias ",