Updates dependencies

.gitignore

@@ -10,3 +10,4 @@ npm-debug.log
 _SpecRunner.html
 bower_components/
 .idea
+.grunt

.travis.yml

@@ -6,5 +6,4 @@ notifications:
 before_install:
   - npm config set ca ""
 before_script:
-  - npm install -g grunt-cli bower
-  - bower install
+  - npm run-script bower

Gruntfile.js

@@ -31,6 +31,15 @@ module.exports = function(grunt) {
         ' * https://github.com/marionettejs/backbone.wreqr/\n' +
         ' */\n\n'
     },
+    assets: {
+      babysitter:   'bower_components/backbone.babysitter/lib/backbone.babysitter.js',
+      underscore:   'bower_components/underscore/underscore.js',
+      backbone:     'bower_components/backbone/backbone.js',
+      jquery:       'bower_components/jquery/dist/jquery.js',
+      sinon:        'bower_components/sinonjs/sinon.js',
+      jasmineSinon: 'bower_components/jasmine-sinon/lib/jasmine-sinon.js',
+      wreqr:        'bower_components/backbone.wreqr/lib/backbone.wreqr.js'
+    },
 
     lint: {
       files: ['src/marionette.*.js']

bower.json

@@ -36,10 +36,11 @@
   ],
 
   "dependencies" : {
-    "backbone": "~1.1.0",
-    "underscore": "~1.5.1",
-    "backbone.babysitter": "~0.0.6",
-    "backbone.wreqr": "~0.2.0"
+    "backbone": "1.0.0 - 1.1.2",
+    "underscore": "1.4.4 - 1.6.0",
+    "backbone.babysitter": "~0.1.0",
+    "backbone.wreqr": "~1.0.0",
+    "jquery": "1.8.0 - 1.11.0"
   },
 
   "devDependencies": {

component.json

@@ -31,7 +31,8 @@
   "dependencies": {
     "marionettejs/backbone.babysitter": "*",
     "marionettejs/backbone.wreqr": "*",
-    "jashkenas/backbone": "*"
+    "jashkenas/backbone": "*",
+    "jashkenas/underscore": "*"
   },
   "scripts": [
     "lib/core/amd/backbone.marionette.js"

package.json

@@ -23,8 +23,8 @@
     }
   ],
   "scripts": {
-    "start": "grunt server",
-    "test": "grunt test"
+    "bower": "./node_modules/bower/bin/bower install",
+    "test": "./node_modules/grunt-cli/bin/grunt test"
   },
   "author": {
     "name": "Derick Bailey",
@@ -40,12 +40,14 @@
   },
   "github": "https://github.com/marionettejs/backbone.marionette",
   "dependencies": {
-    "backbone.babysitter": "~0.0.6",
-    "backbone.wreqr": "~0.2.0",
-    "backbone": "~1.1.0"
+    "backbone.babysitter": "~0.1.0",
+    "backbone.wreqr": "~1.0.0",
+    "backbone": "1.0.0 - 1.1.2",
+    "underscore": "1.4.4 - 1.6.0",
+    "jquery": "1.8.0 - 1.11.0"
   },
   "devDependencies": {
-    "grunt": "~0.4.0",
+    "grunt": "0.4.2",
     "grunt-contrib-jasmine": "~0.4.2",
     "grunt-contrib-jshint": "~0.1.1",
     "grunt-plato": "~0.1.4",
@@ -55,7 +57,9 @@
     "grunt-template-jasmine-istanbul": "~0.1.1",
     "grunt-contrib-watch": "~0.2.0",
     "grunt-contrib-connect": "~0.1.2",
-    "load-grunt-tasks": "~0.3.0"
+    "load-grunt-tasks": "0.3.0",
+    "bower": "1.2.8",
+    "grunt-cli": "0.1.13"
   },
   "volo": {
     "url": "https://raw.github.com/marionettejs/backbone.marionette/v{version}/lib/core/amd/backbone.marionette.js",
@@ -65,10 +69,10 @@
   },
   "jam": {
     "dependencies": {
-      "underscore": ">=1.4.4",
-      "backbone": "~1.1.0",
-      "backbone.babysitter": ">=0.0.6",
-      "backbone.wreqr": ">=0.2.0"
+      "underscore": "1.4.4 - 1.6.0",
+      "backbone": "1.0.0 - 1.1.2",
+      "backbone.babysitter": "~0.1.0",
+      "backbone.wreqr": "~1.0.0"
     },
     "main": "lib/core/amd/backbone.marionette.js",
     "include": [

readme.md

@@ -162,8 +162,8 @@ ideas and examples to the community, please see the wiki page.
 MarionetteJS currently works with the following libraries:
 
 * [jQuery](http://jquery.com) v1.8+
-* [Underscore](http://underscorejs.org) v1.4.4+
-* [Backbone](http://backbonejs.org) v1.0 is preferred. v0.9.9 and v0.9.10 should work still
+* [Underscore](http://underscorejs.org) v1.4.4 - 1.6.0
+* [Backbone](http://backbonejs.org) v1.0.0 - 1.1.2 are preferred. v0.9.9 and v0.9.10 should work still
 * [Backbone.Wreqr](https://github.com/marionettejs/backbone.wreqr)
 * [Backbone.BabySitter](https://github.com/marionettejs/backbone.babysitter)