Updated Bower versions
Change-Id: Ib91e4dd6a3b70e98aac3b0c20bf6690f536f0779
diff --git a/views/ngXosLib/.eslintrc b/views/ngXosLib/.eslintrc
index 6a8ce79..277255d 100644
--- a/views/ngXosLib/.eslintrc
+++ b/views/ngXosLib/.eslintrc
@@ -11,9 +11,6 @@
"node": true,
"es6": true
},
- "plugins": [
- "angular"
- ],
"rules": {
"quotes": [2, "single"],
"camelcase": [0, {"properties": "always"}],
@@ -29,14 +26,6 @@
"no-unused-vars": [1, {"vars": "all", "args": "after-used"}],
"new-cap": 0,
"no-multiple-empty-lines": 2,
-
- "angular/ng_module_name": [2, '/^xos\.*[a-z]*$/'],
-// "angular/ng_controller_name": [2, '/^[a-z].*Ctrl$/'],
- //"angular/ng_service_name": [2, '/^[A-Z].*Service$/'],
- "angular/ng_directive_name": [2, '/^[xos[[A-Z].*]*$/'],
- "angular/ng_di": [0, "function or array"],
- "angular/ng_angularelement": 0,
- "angular/ng_on_watch": 1
},
"globals" :{
"angular": true
diff --git a/views/ngXosLib/generator-xos/app/templates/bower.json b/views/ngXosLib/generator-xos/app/templates/bower.json
index e94e145..068c224 100644
--- a/views/ngXosLib/generator-xos/app/templates/bower.json
+++ b/views/ngXosLib/generator-xos/app/templates/bower.json
@@ -18,17 +18,23 @@
},
"devDependencies": {
"jquery": "2.1.4",
- "angular-mocks": "1.4.7",
- "angular": "1.4.7",
+ "angular-mocks": "1.5.8",
+ "angular": "1.5.8",
"angular-ui-router": "0.2.15",
- "angular-cookies": "1.4.7",
- "angular-animate": "1.4.7",
- "angular-resource": "1.4.7",
+ "angular-cookies": "1.5.8",
+ "angular-animate": "1.5.8",
+ "angular-resource": "1.5.8",
"lodash": "~4.11.1",
"bootstrap-css": "3.3.6",
"angular-chart.js": "~0.10.2",
"d3": "~3.5.17",
"angular-recursion": "~1.0.5",
- "ng-xos-lib": "opencord/ng-xos-lib#~1.0.0"
+ "ng-xos-lib": "opencord/ng-xos-lib#1.1.0"
+ },
+ "resolutions": {
+ "angular": "1.5.8",
+ "angular-cookies": "1.5.8",
+ "angular-animate": "1.5.8",
+ "angular-resource": "1.5.8"
}
}
diff --git a/views/ngXosLib/generator-xos/test/generator.spec.js b/views/ngXosLib/generator-xos/test/generator.spec.js
index 50ec25e..78ed005 100644
--- a/views/ngXosLib/generator-xos/test/generator.spec.js
+++ b/views/ngXosLib/generator-xos/test/generator.spec.js
@@ -5,21 +5,23 @@
const assert = require('yeoman-assert');
const rimraf = require('rimraf');
const mockery = require('mockery');
-const wiredep = require('wiredep');
const firstCharTouppercase = string => string.replace(/^./, string[0].toUpperCase())
+const ngVersion = '1.5.8';
+const ngXosLibVersion = `1.1.0`;
+
const bowerDeps = [
- 'angular',
+ `"angular": "${ngVersion}"`,
'angular-ui-router',
- 'angular-resource',
- 'angular-cookies',
- 'angular-animate',
+ `"angular-resource": "${ngVersion}"`,
+ `"angular-cookies": "${ngVersion}"`,
+ `"angular-animate": "${ngVersion}"`,
'lodash',
'angular-chart.js',
'd3',
- 'angular-recursion',
- 'ng-xos-lib'
+ 'angular-recursion', // NOTE check if it is still needed
+ `"ng-xos-lib": "opencord/ng-xos-lib#${ngXosLibVersion}"`
];
// test values