From fd1767efba85dcfa5a3db27136306eca53519b8a Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Tue, 21 Aug 2018 16:19:43 -0700 Subject: [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. --- mapbox-gl-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mapbox-gl-js') diff --git a/mapbox-gl-js b/mapbox-gl-js index 6c22a1720d..754ec0bf51 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit 6c22a1720dac51eac1c898ca06b3e2f24dbe0810 +Subproject commit 754ec0bf51c3798d096aa38c3f009dcb58d3be71 -- cgit v1.2.1