Merge pull request #12 from philipwalton/upgrade-dependencies

ebidel · ebidel · commit afc91d8bd13f · 2014-11-12T10:33:20.000+11:00
Upgrade dependencies to their latest version.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "google-analytics",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Encapsulates Google Analytics dashboard features into web components",
   "homepage": "http://googlewebcomponents.github.io/google-analytics",
   "authors": [
@@ -9,13 +9,12 @@
   "main": "google-analytics.html",
   "license": "Apache2",
   "keywords": [
-    "google analytics",
+    "google",
     "analytics",
     "dashboard",
     "polymer",
     "web-component",
-    "web-components",
-    "google"
+    "web-components"
   ],
   "ignore": [
     "**/.*",
@@ -26,9 +25,9 @@
     "../"
   ],
   "dependencies": {
-    "google-signin": "GoogleWebComponents/google-signin#~0.1.0",
-    "google-chart": "GoogleWebComponents/google-chart#~0.0.1",
-    "native-promise-only": "~0.4.1-g",
-    "polymer": "Polymer/polymer#~0.4.0"
+    "es6-promise": "^2.0.0",
+    "google-chart": "GoogleWebComponents/google-chart#^0.1.0",
+    "google-signin": "GoogleWebComponents/google-signin#^0.1.0",
+    "polymer": "Polymer/polymer#^0.5.0"
   }
 }
diff --git a/demo.html b/demo.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <title>Google Analytics Polymer Elements Demo</title>
-  <script src="../platform/platform.js"></script>
+  <script src="../webcomponentsjs/webcomponents.js"></script>
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:700,400,300">
   <link rel="stylesheet" href="demo.css" shim-shadowdom>
   <link rel="import" href="../google-signin/google-signin.html">
diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@
 <html>
 <head>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-  <script src="../platform/platform.js"></script>
+  <script src="../webcomponentsjs/webcomponents.js"></script>
   <link rel="import" href="../core-component-page/core-component-page.html">
 
 </head>
diff --git a/promise-import.html b/promise-import.html
@@ -1 +1 @@
-<script src="../native-promise-only/lib/npo.src.js"></script>
+<script src="../es6-promise/promise.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<script src="../native-promise-only/lib/npo.src.js"></script>`
	`1`	`+<script src="../es6-promise/promise.js"></script>`