update ember-cli to 1.10.0

Author: Duke

.editorconfig

@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 

.travis.yml

@@ -1,5 +1,7 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 

Brocfile.js

@@ -9,7 +9,7 @@ var mergeTrees = require('broccoli-merge-trees');
 var app = new EmberApp({
   fingerprint: {
     exclude: ["uhura120.png"]
-  }
+  },
 });
 
 

Makefile

@@ -1,6 +1,6 @@
 EMBER_VERSION = beta
 EMBER_DATA_VERSION = 1.0.0-beta.15
-EMBER_CLI_VERSION = 0.2.0-beta-1
+EMBER_CLI_VERSION = 0.2.1
 
 build:
 	ember cordova:build --platform=android
@@ -16,10 +16,10 @@ store:
 
 
 upgrade:
-	npm uninstall -g ember-cli
+	sudo npm uninstall -g ember-cli
 	npm cache clean
 	bower cache clean
-	npm install -g ember-cli#$(EMBER_CLI_VERSION)
+	sudo npm install -g ember-cli#$(EMBER_CLI_VERSION)
 	rm -Rf node_modules bower_components dist tmp
 	npm install --save-dev ember-cli#$(EMBER_CLI_VERSION)
 	bower install --save ember#$(EMBER_VERSION)

app/styles/app.sass app/styles/_uhura.sass

@@ -0,0 +1 @@
+@import "uhura";

app/styles/app.scss

@@ -3,9 +3,9 @@
   "dependencies": {
     "jquery": "^1.11.1",
     "ember": "1.10.0",
-    "ember-data": "1.0.0-beta.15",
-    "ember-resolver": "~0.1.11",
-    "loader.js": "ember-cli/loader.js#1.0.1",
+    "ember-data": "1.0.0-beta.16",
+    "ember-resolver": "~0.1.14",
+    "loader.js": "ember-cli/loader.js#3.2.0",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
@@ -26,6 +26,7 @@
   },
   "resolutions": {
     "jquery": "^1.11.1",
-    "ember-data": "1.0.0-beta.15"
+    "ember": "1.10.0",
+    "ember-data": "1.0.0-beta.16"
   }
 }

bower.json

@@ -34,12 +34,6 @@ module.exports = function(environment) {
     'style-src': "'self' 'unsafe-inline' http://fonts.googleapis.com"
   }
 
-  ENV.sassOptions = {
-    inputFile: "app.sass"
-  }
-
-
-
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
     ENV.APP.LOG_ACTIVE_GENERATION = true;

config/environment.js

@@ -18,28 +18,27 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.0",
-    "broccoli-manifest": "0.0.4",
-    "broccoli-merge-trees": "^0.2.1",
-    "broccoli-sass": "git://github.com/aexmachina/broccoli-sass#v0.4.x",
-    "ember-cli": "0.2.0-beta.1",
-    "ember-cli-app-version": "0.3.1",
-    "ember-cli-babel": "^4.1.0",
-    "ember-cli-content-security-policy": "0.3.0",
-    "ember-cli-cordova": "git://github.com/poetic/ember-cli-cordova#master",
-    "ember-cli-dependency-checker": "0.0.7",
-    "ember-cli-htmlbars": "^0.7.4",
+    "broccoli-asset-rev": "^2.0.2",
+    "ember-cli": "0.2.1",
+    "ember-cli-app-version": "0.3.3",
+    "ember-cli-babel": "^4.0.0",
+    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-dependency-checker": "0.0.8",
+    "ember-cli-htmlbars": "0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "^0.3.8",
-    "ember-cli-sass": "^3.1.0",
-    "ember-cli-simple-auth": "^0.7.2",
+    "ember-cli-qunit": "0.3.9",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "^1.0.0-beta.15",
+    "ember-data": "1.0.0-beta.16",
     "ember-export-application-global": "^1.0.2",
     "ember-infinite-scroll": "^0.1.4",
+    "ember-sync": "git://github.com/kurko/ember-sync#master",
+    "ember-cli-simple-auth": "^0.7.2",
+    "ember-cli-sass": "3.2.0",
+    "ember-cli-cordova": "git://github.com/poetic/ember-cli-cordova#master",
     "express": "^4.8.5",
     "glob": "^4.0.5",
-    "ember-sync": "git://github.com/kurko/ember-sync#master"
+    "broccoli-manifest": "0.0.4",
+    "broccoli-merge-trees": "^0.2.1"
   }
 }