From d9a938e65a9dd37ee219845f0790be2774623a6f Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Sun, 26 Oct 2014 09:38:51 -0700 Subject: [PATCH] Start v6 --- lib/validate.js | 2 +- package.json | 2 +- test/fixture/constants.input.json | 2 +- test/fixture/functions.input.json | 2 +- test/fixture/layers.input.json | 2 +- test/fixture/root-properties.output.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/validate.js b/lib/validate.js index 0d3d5f1113a..18cf39aa4d1 100644 --- a/lib/validate.js +++ b/lib/validate.js @@ -1,7 +1,7 @@ 'use strict'; var jsonlint = require('jsonlint-lines-primitives'); -var reference = require('mapbox-gl-style-spec/reference/v5'); +var reference = require('mapbox-gl-style-spec/reference/v6'); var parseCSSColor = require('csscolorparser').parseCSSColor; var format = require('util').format; diff --git a/package.json b/package.json index 85d699f10d2..7ebcd7e5420 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "mapbox-gl-styles": "git+https://github.com/mapbox/mapbox-gl-styles.git#mb-pages" }, "dependencies": { - "mapbox-gl-style-spec": "0.0.10", + "mapbox-gl-style-spec": "git+https://github.com/mapbox/mapbox-gl-style-spec.git#v6", "js-beautify": "^1.4.2", "minimist": "0.0.8", "jsonlint-lines-primitives": "~1.6.0", diff --git a/test/fixture/constants.input.json b/test/fixture/constants.input.json index 125ad360070..de366ec00a5 100644 --- a/test/fixture/constants.input.json +++ b/test/fixture/constants.input.json @@ -1,5 +1,5 @@ { - "version": 5, + "version": 6, "constants": { "invalid": "invalid" }, diff --git a/test/fixture/functions.input.json b/test/fixture/functions.input.json index 71cf891524a..16094679bfd 100644 --- a/test/fixture/functions.input.json +++ b/test/fixture/functions.input.json @@ -1,5 +1,5 @@ { - "version": 5, + "version": 6, "sources": { "source": { "type": "vector", diff --git a/test/fixture/layers.input.json b/test/fixture/layers.input.json index 4a89ed9b558..ab0b5dd68c4 100644 --- a/test/fixture/layers.input.json +++ b/test/fixture/layers.input.json @@ -1,5 +1,5 @@ { - "version": 5, + "version": 6, "sources": { "vector": { "type": "vector", diff --git a/test/fixture/root-properties.output.json b/test/fixture/root-properties.output.json index 27050e718cd..4456a71bc47 100644 --- a/test/fixture/root-properties.output.json +++ b/test/fixture/root-properties.output.json @@ -1,7 +1,7 @@ [ { "line": 2, - "message": "version: expected one of [5], 3 found" + "message": "version: expected one of [6], 3 found" }, { "line": 3,