diff --git a/History.md b/History.md index 8dbd8297b9..38c886b9ba 100644 --- a/History.md +++ b/History.md @@ -46,6 +46,12 @@ - uglify-js: 2.4.17 (from 2.4.13) +## v1.0.4.2, 2015-Mar-20 + +* Fix regression in 1.0.4 where using Cordova for the first time in a project + with hyphens in its directory name would fail. #3950 + + ## v1.0.4.1, 2015-Mar-18 * Fix regression in 1.0.4 where `meteor publish-for-arch` only worked for diff --git a/docs/.meteor/release b/docs/.meteor/release index 23c0429646..41f2e623eb 100644 --- a/docs/.meteor/release +++ b/docs/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4.1 +METEOR@1.0.4.2 diff --git a/docs/client/helpers.js b/docs/client/helpers.js index b32379594d..a5b620006c 100644 --- a/docs/client/helpers.js +++ b/docs/client/helpers.js @@ -1,4 +1,4 @@ -release = Meteor.release ? "1.0.4.1" : "(checkout)"; +release = Meteor.release ? "1.0.4.2" : "(checkout)"; Template.registerHelper("release", release); diff --git a/examples/clock/.meteor/release b/examples/clock/.meteor/release index 23c0429646..41f2e623eb 100644 --- a/examples/clock/.meteor/release +++ b/examples/clock/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4.1 +METEOR@1.0.4.2 diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release index 23c0429646..41f2e623eb 100644 --- a/examples/leaderboard/.meteor/release +++ b/examples/leaderboard/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4.1 +METEOR@1.0.4.2 diff --git a/examples/localmarket/.meteor/release b/examples/localmarket/.meteor/release index 23c0429646..41f2e623eb 100644 --- a/examples/localmarket/.meteor/release +++ b/examples/localmarket/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4.1 +METEOR@1.0.4.2 diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release index 23c0429646..41f2e623eb 100644 --- a/examples/todos/.meteor/release +++ b/examples/todos/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4.1 +METEOR@1.0.4.2 diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index d915b3b44e..641d597b06 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.0.43' + version: '1.0.44' }); Package.includeTool(); diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json index 096f56966b..c4ae75fa57 100644 --- a/scripts/admin/banners.json +++ b/scripts/admin/banners.json @@ -5,13 +5,19 @@ "0.9.2.1", "0.9.2.2", "0.9.3", "0.9.3.1", "0.9.4", "1.0", "1.0.1", "1.0.2", "1.0.2.1", "1.0.3", "1.0.3.1", "1.0.3.2"], "banner": { - "text": "=> Meteor 1.0.4.1: MongoDB 2.6 and 3.0 support, performance improvements,\n Cordova upgrades, template-specific subscriptions, and more!\n\n This release is being downloaded in the background. Update your app to\n Meteor 1.0.4.1 by running 'meteor update'." + "text": "=> Meteor 1.0.4.2: MongoDB 2.6 and 3.0 support, performance improvements,\n Cordova upgrades, template-specific subscriptions, and more!\n\n This release is being downloaded in the background. Update your app to\n Meteor 1.0.4.2 by running 'meteor update'." } }, { "versions": ["1.0.4"], "banner": { - "text": "=> Meteor 1.0.4.1: Fixes a regression in publishing packages in 1.0.4.\n\n This release is being downloaded in the background. Update your app to\n Meteor 1.0.4.1 by running 'meteor update'." + "text": "=> Meteor 1.0.4.2: Fixes regressions in publishing packages and creating new Cordova projects in 1.0.4.\n\n This release is being downloaded in the background. Update your app to Meteor 1.0.4.2 by running 'meteor update --patch'." + } + }, + { + "versions": ["1.0.4.1"], + "banner": { + "text": "=> Meteor 1.0.4.2: Fixes a regression in creating new Cordova projects in 1.0.4 and 1.0.4.1.\n\n This release is being downloaded in the background. Update your app to Meteor 1.0.4.2 by running 'meteor update --patch'." } } ] diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index 78d5bcb878..36aa8a73f1 100644 --- a/scripts/admin/meteor-release-official.json +++ b/scripts/admin/meteor-release-official.json @@ -1,7 +1,7 @@ { "track": "METEOR", - "version": "1.0.4.1", - "patchFrom": ["1.0.4"], + "version": "1.0.4.2", + "patchFrom": ["1.0.4", "1.0.4.1"], "recommended": false, "official": true, "description": "The Official Meteor Distribution"