Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Roll dart to 7764e6962e22afcf4b58c4e3cef3147330f3c884. #4960

Merged
merged 5 commits into from
Apr 10, 2018
Merged

Roll dart to 7764e6962e22afcf4b58c4e3cef3147330f3c884. #4960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
555e324
Roll dart to 7764e6962e22afcf4b58c4e3cef3147330f3c884.
aam Apr 10, 2018
05e8106
Revert "Roll src/third_party/skia/ 9874bf1bc..52e16d984 (135 commits)…
aam Apr 10, 2018
7ea07a2
Merge branch 'master' of github.com:flutter/engine into roll-dart-201…
aam Apr 10, 2018
0f531c9
Ignore freetype2 in skia since 'we use our own version'
aam Apr 10, 2018
dc89f85
Update license hash
aam Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': 'ef926f98f525b085e1488be8c42b1c3f0a24c50d',
'dart_revision': '7764e6962e22afcf4b58c4e3cef3147330f3c884',

'dart_args_tag': '1.4.1',
'dart_async_tag': '2.0.6',
Expand All @@ -46,7 +46,7 @@ vars = {
'dart_convert_tag': '2.0.1',
'dart_crypto_tag': '2.0.2+1',
'dart_csslib_tag': '0.14.1',
'dart_dart2js_info_tag': '0.5.5+1',
'dart_dart2js_info_tag': '0.5.6',
'dart_dart_style_tag': '1.0.10',
'dart_dartdoc_tag': 'v0.18.1',
'dart_fixnum_tag': '0.10.5',
Expand All @@ -60,7 +60,7 @@ vars = {
'dart_intl_tag': '0.15.2',
'dart_isolate_tag': '1.1.0',
'dart_json_rpc_2_tag': '2.0.6',
'dart_linter_tag': '0.1.46',
'dart_linter_tag': '0.1.47',
'dart_logging_tag': '0.11.3+1',
'dart_markdown_tag': '1.1.1',
'dart_matcher_tag': '0.12.1+4',
Expand All @@ -76,7 +76,7 @@ vars = {
'dart_pool_tag': '1.3.4',
'dart_protobuf_tag': '0.7.1',
'dart_pub_rev': '4947e0b3cb3ec77e4e8fe0d3141ce4dc60f43256',
'dart_pub_semver_tag': '1.3.4',
'dart_pub_semver_tag': '1.3.6',
'dart_quiver_tag': '5aaa3f58c48608af5b027444d561270b53f15dbf',
'dart_resource_rev': 'af5a5bf65511943398146cf146e466e5f0b95cb9',
'dart_root_certificates_rev': '16ef64be64c7dfdff2b9f4b910726e635ccc519e',
Expand Down
1 change: 1 addition & 0 deletions tools/licenses/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,6 +1809,7 @@ class RepositorySkiaThirdPartyDirectory extends RepositoryGenericThirdPartyDirec
bool shouldRecurse(fs.IoNode entry) {
return entry.name != 'giflib' // contains nothing that ends up in the binary executable
&& entry.name != 'freetype' // we use our own version
&& entry.name != 'freetype2' // we use our own version
&& entry.name != 'icu' // we use our own version
&& entry.name != 'libjpeg-turbo' // we use our own version
&& entry.name != 'libpng' // we use our own version
Expand Down
2 changes: 1 addition & 1 deletion travis/licenses_golden/licenses_third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 5e7a29bc2be55a7311df8f5a7dff2d34
Signature: bea26d7863b6f1cfa1d0c0ae3775bf93

UNUSED LICENSES:

Expand Down