[core, test] Bump GL JS pin to bring gl-native back in sync with gl-js.

Requires changing `generate-style-code` to treat 'formatted' as being the same as 'string' until gl-native gets 'formatted' support with https://github.com/mapbox/mapbox-gl-native/pull/12624.
To make nitpick happy, PropertyFunction.java uses the latest "text-field" description from v8.json. It's technically correct, just kind of pointless since the "If a plain `string` is provided" clause will always be true.
This commit is contained in:
Chris Loer
2018-08-21 16:19:43 -07:00
committed by Chris Loer
parent 33cd094d85
commit fd1767efba
6 changed files with 34 additions and 4 deletions

View File

@@ -37,6 +37,7 @@ global.evaluatedType = function (property) {
return 'bool';
case 'number':
return 'float';
case 'formatted':
case 'string':
return 'std::string';
case 'enum':
@@ -120,6 +121,7 @@ global.defaultValue = function (property) {
switch (property.type) {
case 'number':
return property.default;
case 'formatted':
case 'string':
return JSON.stringify(property.default || "");
case 'enum':