Skip to content

Commit

Permalink
Upgrade Angular dependencies to 1.4.6 and 1.3.19
Browse files Browse the repository at this point in the history
Upgraded Foundation support to 5.5
Dropped support for Angular 1.2
  • Loading branch information
jbrowning committed Sep 24, 2015
1 parent 6c742e6 commit 6418d41
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
5 changes: 3 additions & 2 deletions Gruntfile.js
Expand Up @@ -8,8 +8,9 @@ module.exports = function(grunt) {
grunt.util.linefeed = '\n';

grunt.initConfig({
ngversion: '1.3.3',
fdversion: '5.2.0',
ngversion: '1.4.6',
nglegacyversion: '1.3.19',
fdversion: '5.5.2',
faversion: '4.2.0',
modules: [],//to be filled in by build task
pkg: grunt.file.readJSON('package.json'),
Expand Down
13 changes: 8 additions & 5 deletions bower.json
Expand Up @@ -14,13 +14,16 @@
"tests"
],
"dependencies": {
"angular": "=1.3.3",
"angular-legacy": "angular#1.2.26",
"angular-mocks": "=1.3.3",
"angular-mocks-legacy": "angular-mocks#1.2.26",
"angular": "~1.4.0"
},
"devDependencies": {
"angular": "=1.4.6",
"angular-legacy": "angular#1.3.19",
"angular-mocks": "=1.4.6",
"angular-mocks-legacy": "angular-mocks#1.3.19",
"jquery": "=1.8.2"
},
"resolutions": {
"angular": "=1.3.3"
"angular": "=1.4.6"
}
}
8 changes: 2 additions & 6 deletions misc/demo/index.html
Expand Up @@ -82,12 +82,8 @@ <h3>Dependencies</h3>
JavaScript is required. The <strong>only required dependencies</strong> are:
</p>
<ul>
<li><a href="http://angularjs.org" target="_blank">AngularJS</a> (requires AngularJS 1.2.x, tested with <%= ngversion %>)</li>
<li><a href="http://foundation.zurb.com"
target="_blank">Foundation CSS</a> (tested with version <%= fdversion %>).
This version of the library (<%= pkg.version %>) works only with
Foundation CSS in version 5.x.
</li>
<li><strong>AngularJS</strong> 1.3 or 1.4 (tested with <%= nglegacyversion %> and <%= ngversion %>)</li>
<li><strong>Foundation 5 CSS</strong> (tested with version <%= fdversion %>).</li>
</ul>
<h3>Downloading</h3>
<p>
Expand Down

0 comments on commit 6418d41

Please sign in to comment.