Update vaadin dependencies to P2 versions

diff --git a/bower.json b/bower.json
index 8da6ac16bf7e3c00bf27b4daf6afd4c6f65d8f94..cf515d93aaee4695c5317ac70f0dee13bc692add 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -24,42 +24,51 @@
     "**/tests"
   ],
   "dependencies": {
-    "vaadin-combo-box": "vaadin/vaadin-combo-box#1.3.x",
-    "vaadin-context-menu": "vaadin/vaadin-context-menu#1.0.x",
-    "vaadin-date-picker": "vaadin/vaadin-date-picker#1.2.x",
-    "vaadin-grid": "vaadin/vaadin-grid#2.0.x",
-    "vaadin-icons": "vaadin/vaadin-icons#3.0.x",
-    "vaadin-split-layout": "vaadin/vaadin-split-layout#1.1.x",
-    "vaadin-upload": "vaadin/vaadin-upload#1.1.x"
+    "vaadin-button": "^1.0.0",
+    "vaadin-combo-box": "^2.0.0",
+    "vaadin-context-menu": "^2.0.0",
+    "vaadin-date-picker": "^2.0.0",
+    "vaadin-form-layout": "^1.0.0",
+    "vaadin-grid": "^3.0.0",
+    "vaadin-icons": "^4.0.0",
+    "vaadin-split-layout": "^2.0.0",
+    "vaadin-text-field": "^1.0.0",
+    "vaadin-upload": "^2.0.0"
   },
   "devDependencies": {
-    "web-component-tester": "^4.0.3",
-    "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
-    "iron-component-page": "PolymerElements/iron-component-page#~1.1.0",
-    "elements-demo-resources": "vaadin/elements-demo-resources#master",
     "mock-http-request": "philikon/MockHttpRequest#master",
-    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
-    "paper-toast": "PolymerElements/paper-toast#^1.0.0",
-    "paper-menu": "PolymerElements/paper-menu#^1.2.2",
-    "paper-item": "PolymerElements/paper-item#^1.2.1",
+    "paper-toast": "^2.0.0",
+    "paper-listbox": "^2.0.0",
+    "paper-item": "^2.0.0",
     "sugar": "^2.0.0",
-    "paper-checkbox": "PolymerElements/paper-checkbox#^1.4.2"
-  },
-  "resolutions": {
-    "polymer": "v1.1.1",
-    "iron-iconset-svg": "PolymerElements/iron-iconset-svg#^1.1.0"
+    "paper-checkbox": "^2.0.0",
+    "elements-demo-resources": "^2.0.0",
+    "iron-component-page": "^2.0.0",
+    "iron-demo-helpers": "^2.0.0",
+    "iron-form": "2.0-preview",
+    "iron-test-helpers": "^2.0.0",
+    "web-component-tester": "^6.0.0",
+    "iron-list": "^2.0.0"
   },
   "masterOverrides": {
     "version": "master",
     "dependencies": {
-      "vaadin-grid": "vaadin/vaadin-grid#master",
+      "vaadin-button": "vaadin/vaadin-button#master",
       "vaadin-combo-box": "vaadin/vaadin-combo-box#master",
-      "vaadin-icons": "vaadin/vaadin-icons#master",
+      "vaadin-context-menu": "vaadin/vaadin-context-menu#master",
       "vaadin-date-picker": "vaadin/vaadin-date-picker#master",
-      "vaadin-upload": "vaadin/vaadin-upload#master",
+      "vaadin-form-layout": "vaadin/vaadin-form-layout#master",
+      "vaadin-grid": "vaadin/vaadin-grid#master",
+      "vaadin-icons": "vaadin/vaadin-icons#master",
       "vaadin-split-layout": "vaadin/vaadin-split-layout#master",
-      "vaadin-context-menu": "vaadin/vaadin-context-menu#master"
+      "vaadin-text-field": "vaadin/vaadin-text-field#master",
+      "vaadin-upload": "vaadin/vaadin-upload#master"
     }
+  },
+  "resolutions": {
+    "iron-flex-layout": "^2.0.0",
+    "iron-icon": "2.0.0",
+    "iron-iconset-svg": "^2.0.0",
+    "iron-meta": "1 - 2"
   }
 }

diff --git a/package.json b/package.json
index 3dcd4df363d992f55b458a7b7ceb79efc444923f..834022bc4c2a1b435084a65b291e375856bb15d5 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vaadin-core-elements",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Vaadin Core Elements is an evolving set of free, open sourced custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.",
   "author": "Vaadin Ltd",
   "license": "Apache-2.0",