Bump and build v2.0.1

marionettejs · Jun 19, 2014 · 8b03703 · 8b03703
1 parent ec83bf4
commit 8b03703
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -6,7 +6,7 @@
     "./lib/backbone.marionette.js",
     "./lib/core/backbone.marionette.js"
   ],
-  "version": "2.0.0",
+  "version": "2.0.1",
   "keywords": [
     "backbone",
     "framework",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### v2.0.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.0.0...v2.0.1)
+  * Fix missing Wreqr and Babysitter in Core AMD definition.
+
 ### v2.0.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.8.8...v2.0.0)
   * This is a breaking release and contains many API updates and changes, thus changelog is quite large for this release, please refer to the [google doc](https://docs.google.com/document/d/1fuXb9N5LwmdPn-teMwAo3c8JTx6ifUowbqFY1NNSdp8/edit#) for the full details of what is new and what has changed.
 

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "repo": "marionettejs/backbone.marionette",
   "main": "lib/core/amd/backbone.marionette.js",
   "keywords": [

diff --git a/lib/backbone.marionette.js b/lib/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.0.0
+// v2.0.1
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -489,7 +489,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.0.0';
+  Marionette.VERSION = '2.0.1';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;

diff --git a/lib/backbone.marionette.min.js b/lib/backbone.marionette.min.js
diff --git a/lib/core/backbone.marionette.js b/lib/core/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.0.0
+// v2.0.1
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -10,7 +10,7 @@
 (function(root, factory) {
 
   if (typeof define === 'function' && define.amd) {
-    define(['backbone', 'underscore'], function(Backbone, _) {
+    define(['backbone', 'underscore', 'backbone.wreqr', 'backbone.babysitter'], function(Backbone, _) {
       return (root.Marionette = factory(root, Backbone, _));
     });
   } else if (typeof exports !== 'undefined') {
@@ -30,7 +30,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.0.0';
+  Marionette.VERSION = '2.0.1';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;

diff --git a/lib/core/backbone.marionette.map b/lib/core/backbone.marionette.map
diff --git a/lib/core/backbone.marionette.min.js b/lib/core/backbone.marionette.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "main": "lib/core/backbone.marionette.js",
   "keywords": [

diff --git a/upgradeGuide.md b/upgradeGuide.md
@@ -1,3 +1,6 @@
+## v2.0.0 - v2.0.x
+No breaking changes have been introduced between these versions
+
 ## v1.x.x - v2.0.0
 Large amounts of things have changed between these releases.
 Please refer to https://github.com/marionettejs/Marionette.Upgrade to ease the transition from any 1.x app.