Skip to content
This repository was archived by the owner on Jun 14, 2019. It is now read-only.

Commit 60d4a32

Browse files
committed
Merge branch 'feature/update-to-nodev4-infrastructure' into canary
2 parents 9adef1f + 8d57881 commit 60d4a32

File tree

5 files changed

+28
-6
lines changed

5 files changed

+28
-6
lines changed

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.1

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
sudo: false
22
language: node_js
33
node_js:
4-
- "0.12"
4+
- "4.1"
55

66
addons:
77
code_climate:
88
repo_token: 94ea5ac76984c311dcbadb53a52dd219400775e20402587a0063d8b9d3a66bca
99

1010
before_install:
11-
- '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
12-
- npm install -g npm@latest
13-
- npm install -g grunt-cli codeclimate-test-reporter
11+
- npm install -qg npm
12+
- npm install -qg grunt-cli codeclimate-test-reporter
1413

1514
before_script:
1615
- export DISPLAY=:99.0
@@ -24,3 +23,4 @@ env:
2423
- TEST_SCOPE=angular_1.2.x
2524
- TEST_SCOPE=angular_1.3.x
2625
- TEST_SCOPE=angular_1.4.x
26+
- TEST_SCOPE=angular_1.5.x

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function(config) {
4444

4545
// list of files / patterns to load in the browser
4646
files: [
47-
'node_modules/karma-babel-preprocessor/node_modules/babel-core/browser-polyfill.js',
47+
'node_modules/babel-core/browser-polyfill.js',
4848
injectByScope(scope, 'angular/angular.js'),
4949
injectByScope(scope, 'angular-mocks/angular-mocks.js'),
5050
'test/unit/mock/sockjs.js',

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
"facade",
1010
"websocket"
1111
],
12+
"engines": {
13+
"node": ">=4.0"
14+
},
1215
"scripts": {
1316
"prepublish": "bower install",
1417
"test": "grunt install-test && grunt test",
@@ -65,6 +68,7 @@
6568
"karma-phantomjs-launcher": "^0.2.1",
6669
"load-grunt-tasks": "~3.2.0",
6770
"lodash": "^3.10.1",
68-
"mocha": "^2.2.5"
71+
"mocha": "^2.2.5",
72+
"phantomjs": "^1.9.18"
6973
}
7074
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"author": "Jan Philipp",
3+
"name": "angular-vertxbus",
4+
"description": "",
5+
"version": "0.0.0",
6+
"homepage": "http://github.com/knalli/angular-vertxbus",
7+
"repository": {
8+
"type": "git",
9+
"url": "git://github.com/knalli/angular-vertxbus"
10+
},
11+
"devDependencies": {
12+
"angular": "^1.5.0-beta.0",
13+
"angular-mocks": "^1.5.0-beta.0",
14+
"sockjs-client": "~1.0.3",
15+
"vertx3-eventbus-client": "~3.0.0"
16+
}
17+
}

0 commit comments

Comments
 (0)