Merge pull request #30 from Neovici/gh29cotc

refs #29: Upgrade to 2.x
Neovici · Nov 14, 2018 · ef97674 · ef97674
2 parents 2f56858 + 0b7541e
commit ef97674
Show file tree

Hide file tree

Showing 12 changed files with 14,080 additions and 2,837 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+lts/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: node_js
-node_js: "lts/*"
-dist: trusty
-sudo: required
 env:
   global:
     - CC_TEST_REPORTER_ID=c07e476140f800aa20bc816ac34938dbf1e4b43d9c2e85e1c33d027f239feb11
+    - SAUCE_USERNAME=nomego
+    - secure: azH+aT5cbW0A+wu812SVEeC0O0kmS1VGoqQS3p1e1Ouw73CRXBkX7rxE0Pv0wVGSQC/fUHSPuZxpD2iZXaSrPZeua/XS4RixkYkNmw70vaazj/bcbTRZogWfiX86n8pFE9/NjMZuz6yiI82iJHvV0l3dAoqFAqkT9Oy2UdfIWZj+wPwtbSe/DNElE0BEKVeSXfxGmz2piFnEfuTC9i8UXC/VFkiirLWztRLlc9rvSeYDvOfbxtSsY99n7NAgDQaP07vLrICjtouGGL4bStoZ/d8J1pmQYF7vFwJ3m5JK+m6wytyNiu7lD1DY2BXDgyOP6M4Tz+IQGnQQkSxGqRN/C5BKiySJ4UO00ZMqpTZUZ8Xo5Uhxajyn+SneCHY9OupW6SuPfMnJgl5K9PdICS7O2ZY49C10h9btBcEXGRJBl7fbwNCXTuYl6Tlpc/4RBqFKaKu1NBIssCwAhd1P3w5cb41rrVkhLUrPUst1oIKrVnCgGTMTNmtCbkvy67jxTJ1tynqHFPVg5+ynsbVvxLfw6uC1sEdPERnuXgv5gee+Sc+EEotVrgjnWyer57I4ohAnZ9yl7LWdLIX6sKYQvhDIYxobiNIOqZ2uHtb73C0CagAoeIdL69jp+voVbt81OvvKiwvOYlXgMC5DHhvcpPun19u/ku3bqNEu2F2XYtpcIco=
 addons:
   firefox: latest
   apt:
@@ -17,7 +16,6 @@ cache:
   directories:
     - node_modules
     - bower_components
-    - bower_components-1.x
     - .eslintcache
     - $HOME/.cache/bower
 before_script:
@@ -26,7 +24,7 @@ before_script:
   - ./cc-test-reporter before-build
   - yarn run lint
 script:
-  - xvfb-run yarn test
+  - yarn test
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 notifications:

diff --git a/bower.json b/bower.json
@@ -3,55 +3,23 @@
 	"description": "cosmoz-omnitable column to display a tree node",
 	"main": "cosmoz-omnitable-treenode-column.html",
 	"dependencies": {
-		"polymer": "Polymer/polymer#1.9 - 2",
+		"polymer": "Polymer/polymer#^2.6.1",
 		"cosmoz-omnitable": "Neovici/cosmoz-omnitable#^1.0.0",
 		"cosmoz-tree": "Neovici/cosmoz-tree#^1.0.0",
 		"cosmoz-treenode": "Neovici/cosmoz-treenode#^1.0.0",
 		"paper-autocomplete": "ellipticaljs/paper-autocomplete#^3.7.0",
-		"paper-spinner": "PolymerElements/paper-spinner#1 - 2"
+		"paper-spinner": "PolymerElements/paper-spinner#^2.0.0"
 	},
 	"devDependencies": {
-		"iron-component-page": "PolymerElements/iron-component-page#1 - 3",
-		"iron-demo-helpers": "PolymerElements/iron-demo-helpers#1 - 2",
-		"iron-test-helpers": "PolymerElements/iron-test-helpers#1 - 2",
+		"iron-component-page": "PolymerElements/iron-component-page#^3.0.0",
+		"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
+		"iron-test-helpers": "PolymerElements/iron-test-helpers#^2.0.0",
 		"web-component-tester": "Polymer/web-component-tester#^6.0.0",
 		"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0",
-		"iron-flex-layout": "PolymerElements/iron-flex-layout#1 - 2",
-		"iron-ajax": "PolymerElements/iron-ajax#1 - 2",
-		"iron-iconset-svg": "PolymerElements/iron-iconset-svg#1 - 2",
-		"promise-polyfill": "PolymerLabs/promise-polyfill#1 - 2"
-	},
-	"variants": {
-		"1.x": {
-			"dependencies": {
-				"polymer": "Polymer/polymer#^1.9",
-				"cosmoz-omnitable": "Neovici/cosmoz-omnitable#^1.0.0",
-				"cosmoz-tree": "Neovici/cosmoz-tree#^1.0.0",
-				"cosmoz-treenode": "Neovici/cosmoz-treenode#^1.0.0",
-				"paper-autocomplete": "ellipticaljs/paper-autocomplete#^3.7.0",
-				"paper-spinner": "PolymerElements/paper-spinner#1 - 2"
-			},
-			"devDependencies": {
-				"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
-				"iron-component-page": "PolymerElements/iron-component-page#1 - 2",
-				"iron-demo-helpers": "PolymerElements/iron-demo-helpers#1",
-				"iron-test-helpers": "PolymerElements/iron-test-helpers#1",
-				"web-component-tester": "Polymer/web-component-tester#^6.0.0",
-				"iron-flex-layout": "PolymerElements/iron-flex-layout#1 - 2",
-				"iron-ajax": "PolymerElements/iron-ajax#1 - 2",
-				"iron-iconset-svg": "PolymerElements/iron-iconset-svg#1 - 2"
-			},
-			"resolutions": {
-				"webcomponentsjs": "^0.7",
-				"iron-flex-layout": "^1.0",
-				"iron-iconset-svg": "^1.0",
-				"paper-icon-button": "^1.0",
-				"iron-icons":	"^1.0",
-				"iron-icon":	"^1.0",
-				"paper-ripple": "^1.0"
-			}
-		}
-	},
+		"iron-flex-layout": "PolymerElements/iron-flex-layout#^2.0.0",
+		"iron-ajax": "PolymerElements/iron-ajax#^2.0.0",
+		"iron-iconset-svg": "PolymerElements/iron-iconset-svg#^2.0.0"
+	},	
 	"resolutions": {
 		"webcomponentsjs": "^1.0.0"
 	}