Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core, test] Bump GL JS pin, port icon-size fixes #12702

Merged
merged 3 commits into from
Aug 22, 2018
Merged

Conversation

ChrisLoer
Copy link
Contributor

We've gotten too far out of sync, time to bite the bullet.

  • Make generate-style-code treat "formatted" as essentially the same as "string"
  • Tolerate a not technically wrong but meaningless-because-not-yet-implemented description of text-field in PropertyFactory.java.
  • Integrate Ansis' shader changes from [core] fix icon-size for small data-driven values #12633
  • Add test ignores

cc @ansis @mollymerp

Requires changing `generate-style-code` to treat 'formatted' as being the same as 'string' until gl-native gets 'formatted' support with #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.
@ChrisLoer
Copy link
Contributor Author

For #12633, we might still want to have a separate PR to look at whether to do logging changes (not sure), and also to add a changelog entry.

Copy link
Contributor

@mollymerp mollymerp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙇‍♀️

@ChrisLoer ChrisLoer merged commit 49cf31d into master Aug 22, 2018
@ChrisLoer ChrisLoer deleted the bump-gl-js-pin branch August 22, 2018 05:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants