Skip to content

Commit

Permalink
Merge pull request #155 from eneufeld/feature_updateVersions
Browse files Browse the repository at this point in the history
Updated dependencies to latest eg angular to 1.4.8
  • Loading branch information
edgarmueller committed Dec 18, 2015
2 parents d78d77a + db776fe commit 8b986bb
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "0.12"
- "4.2.3"

install:
- npm install
Expand All @@ -14,4 +14,4 @@ before_script:
script:
- grunt examples
- grunt test
- grunt coveralls:karma_tests
- grunt coveralls:karma_tests
18 changes: 9 additions & 9 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
"tests"
],
"dependencies": {
"angular": "1.3.16",
"angular-bootstrap": "0.13.4",
"angular-loader": "1.3.16",
"angular-route": "1.3.16",
"angular": "1.4.8",
"angular-bootstrap": "0.14.3",
"angular-loader": "1.4.8",
"angular-route": "1.4.8",
"angular-ui": "0.4.0",
"angular-ui-grid": "3.0.1",
"angular-ui-validate": "1.1.1",
"bootstrap": "3.3.4",
"angular-ui-grid": "3.0.7",
"angular-ui-validate": "1.2.2",
"bootstrap": "3.3.6",
"json-refs": "~0.2.0",
"tv4": "1.2.3"
},
"devDependencies": {
"angular-mocks": "1.3.16",
"angular-resource": "1.3.16",
"angular-mocks": "1.4.8",
"angular-resource": "1.4.8",
"angular-ui-ace": "0.2.3",
"polymer": "Polymer/polymer#^1.2.0",
"paper-input": "PolymerElements/paper-input#^1.0.0"
Expand Down
67 changes: 34 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,40 @@
"repository": "https://github.com/eclipsesource/jsonforms",
"license": "MIT",
"devDependencies": {
"bootstrap": "^3.3.4",
"bower": "^1.3.1",
"grunt": "^0.4.5",
"grunt-angular-builder": "^1.0.0-beta3",
"grunt-angular-templates": "^0.5.7",
"grunt-browserify": "^3.8.0",
"grunt-bump": "^0.6.0",
"grunt-cli": "^0.1.3",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-connect": "^0.10.1",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-jshint": "^0.11.2",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-uglify": "^0.9.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-coveralls": "^1.0.0",
"grunt-file-append": "0.0.6",
"grunt-git": "^0.3.7",
"grunt-karma": "^0.12.1",
"grunt-protractor-runner": "^2.0.0",
"grunt-ts": "^5.1.0",
"http-server": "^0.6.1",
"jsonplaceholder": "0.3.1",
"karma": "~0.13",
"karma-angular-filesort": "^1.0.1",
"karma-chrome-launcher": "^0.1.2",
"karma-coverage": "^0.5.3",
"karma-firefox-launcher": "^0.1.3",
"karma-jasmine": "~0.2.0",
"karma-ng-html2js-preprocessor": "^0.1.2",
"protractor": "^2.0.0",
"remap-istanbul": "^0.3.1"
"bootstrap": "^3.3.6",
"bower": "^1.7.0",
"grunt": "^0.4.5",
"grunt-angular-builder": "^1.0.0-beta3",
"grunt-angular-templates": "^0.5.9",
"grunt-browserify": "^4.0.1",
"grunt-bump": "^0.7.0",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^0.7.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-connect": "^0.11.2",
"grunt-contrib-copy": "^0.8.2",
"grunt-contrib-jshint": "^0.11.3",
"grunt-contrib-less": "^1.1.0",
"grunt-contrib-uglify": "^0.11.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-coveralls": "^1.0.0",
"grunt-file-append": "0.0.6",
"grunt-git": "^0.3.7",
"grunt-karma": "^0.12.1",
"grunt-protractor-runner": "^3.0.0",
"grunt-ts": "^5.2.0",
"http-server": "^0.8.5",
"jasmine-core":"2.4.1",
"jsonplaceholder": "0.3.1",
"karma": "^0.13.15",
"karma-angular-filesort": "^1.0.1",
"karma-chrome-launcher": "^0.2.2",
"karma-coverage": "^0.5.3",
"karma-firefox-launcher": "^0.1.7",
"karma-jasmine": "^0.3.6",
"karma-ng-html2js-preprocessor": "^0.2.0",
"protractor": "^3.0.0",
"remap-istanbul": "^0.5.1"
},
"scripts": {
"postinstall": "bower install && webdriver-manager update",
Expand Down

0 comments on commit 8b986bb

Please sign in to comment.