Merge pull request #379 from openlayers/prepare_v1.19

Prepare v1.19
openlayers · Aug 9, 2016 · c43c822 · c43c822
2 parents 3459102 + b7f6238
commit c43c822
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,11 @@
 sudo: false
+
+language: node_js
+
+node_js:
+  - "4"
+  - "6"
+
 cache:
   directories:
     - node_modules
@@ -8,7 +15,6 @@ git:
 
 before_install:
   - git submodule update --init ol3
-  - npm install -g npm && npm install
 
 script:
   - NO_CESIUM=1 make dist

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# v 1.19 - 2016-08-08
+
+* Changes
+  * Require node 4 or 6.
+  * Port to Cesium 1.24.
+
 # v 1.18 - 2016-07-18
 
 * Changes

diff --git a/cesium b/cesium
diff --git a/examples/rastersync.js b/examples/rastersync.js
@@ -8,13 +8,13 @@ var layer0 = new ol.layer.Tile({
 });
 var layer1 = new ol.layer.Tile({
   source: new ol.source.TileJSON({
-    url: 'http://tileserver.maptiler.com/grandcanyon.json',
+    url: 'https://tileserver.maptiler.com/grandcanyon.json',
     crossOrigin: 'anonymous'
   })
 });
 
 var tileJsonSource = new ol.source.TileJSON({
-  url: 'http://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json',
+  url: 'https://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json',
   crossOrigin: 'anonymous'
 });
 
@@ -32,7 +32,7 @@ var ol2d = new ol.Map({
 var ol3d = new olcs.OLCesium({map: ol2d, target: 'map3d'});
 var scene = ol3d.getCesiumScene();
 var terrainProvider = new Cesium.CesiumTerrainProvider({
-    url : '//assets.agi.com/stk-terrain/world'
+  url : 'https://assets.agi.com/stk-terrain/world'
 });
 scene.terrainProvider = terrainProvider;
 

diff --git a/package.json b/package.json
@@ -12,15 +12,15 @@
     "url": "https://github.com/openlayers/ol3-cesium/issues"
   },
   "dependencies": {
-    "async": "1.5.2",
+    "async": "2.0.1",
     "htmlparser2": "3.9.1"
   },
   "devDependencies": {
-    "closure-util": "1.14.0",
+    "closure-util": "1.15.0",
     "geojsonhint": "1.2.1",
     "fs-extra": "0.30.0",
     "jsdoc": "~3.4.0",
-    "eslint": "2.13.1",
+    "eslint": "3.2.2",
     "eslint-config-openlayers": "5.0.0",
     "nomnom": "1.8.1",
     "temp": "0.8.3",