From 18678b75db328f66a67931f8bd8bfde55549a45e Mon Sep 17 00:00:00 2001
From: Robert Jackson <rwjblue@twitch.tv>
Date: Fri, 12 Aug 2016 22:57:10 -0400
Subject: [PATCH] Update emberjs-build to v0.14.0.

Updates to a version of emberjs-build that does not use
glimmer-template-precompiler (an obsolete package). Instead it passes
through the current glimmer version to the underlying template
compliation so that the templates shipped with Ember are for the same
version of glimmer that will be used at runtime.

Also, updates to using tagged builds.
---
 ember-cli-build.js | 1 +
 package.json       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 2923ed75e14..dd69c3e24b4 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -143,6 +143,7 @@ module.exports = function() {
       production: getFeatures('production')
     },
     htmlbars: require('htmlbars'),
+    glimmer: require('glimmer-engine'),
     packages: getPackages(features),
     vendoredPackages: vendorPackages,
     version: version
diff --git a/package.json b/package.json
index 6d72bf91a00..27907ac9583 100644
--- a/package.json
+++ b/package.json
@@ -33,13 +33,13 @@
     "ember-cli-sauce": "^1.4.2",
     "ember-cli-yuidoc": "0.8.4",
     "ember-publisher": "0.0.7",
-    "emberjs-build": "0.13.5",
+    "emberjs-build": "0.14.0",
     "express": "^4.5.0",
     "finalhandler": "^0.4.0",
     "git-repo-info": "^1.1.4",
     "git-repo-version": "^0.3.1",
     "github": "^0.2.3",
-    "glimmer-engine": "tildeio/glimmer#f961049",
+    "glimmer-engine": "0.7.0",
     "glob": "^5.0.13",
     "htmlbars": "0.14.24",
     "mocha": "^2.4.5",