ember-validations as ember-addons

Brocfile.js

@@ -58,8 +58,6 @@ app.import({
   production: 'bower_components/webshim/js-webshim/minified/polyfiller.js'
 });
 
-app.import('bower_components/ember-validations/index.js');
-
 app.import('bower_components/sjcl/sjcl.js');
 
 app.import('bower_components/modernizr/modernizr.js');

app/controllers/create/index.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function() {
       // redirect to CreateMeta

app/controllers/create/meta.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function() {
       // redirect to CreateOptions

app/controllers/create/options-datetime.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     /*
      * copy first line

app/controllers/create/options.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function(){
       var pollType = this.get('pollType');

app/controllers/create/settings.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function(){
       // check if answer type is selected

app/controllers/poll.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
     encryptionKey: '',
     newUserName: '',
     queryParams: ['encryptionKey'],

bower.json

@@ -13,7 +13,6 @@
     "ember-qunit": "0.1.8",
     "ember-qunit-notifications": "0.0.4",
     "qunit": "~1.15.0",
-    "ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/tags/v1.0.0/ember-validations.js",
     "ember-easyForm": "http://builds.dockyard.com/ember-easyForm/latest/ember-easyForm.js",
     "ember-i18n": "~2.9.0",
     "sjcl": "~1.0.0",

package.json

@@ -34,6 +34,7 @@
     "express": "^4.8.5",
     "glob": "^4.0.5",
     "broccoli-static-compiler": "~0.2.1",
-    "ember-cli-less": "~1.0.4"
+    "ember-cli-less": "~1.0.4",
+    "ember-validations": "~2.0.0"
   }
 }