From d593d3ebd2b4d9d5d9b53ae30ef580466a273f7a Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 10 Apr 2018 16:44:16 -0700 Subject: [PATCH 1/2] Roll dart sdk again. Previous roll required 23ae4fa098 revert. Changes since last roll: ``` 23ae4fa098 Revert "[VM] Reduce Smi size to 32 bit on 64 bit platforms" 6ab6d1eda9 Suppress fromRect its only available in DOMRect and not in ClientRect - will open bug to fix this issue. f4621b1898 [tests hot-reload] Remove obsolete crash entry in status file (issue #31660). f3cec061eb Capture type variables in global NSM stubs 2247843f48 Update checked-in SDKs to 2.0.0-dev.47.0 34be5de0c7 Fixed _DomRect class to map to both ClientRect and DOMRect for browser backward compat. 5c508ff785 Update more IdentifierContext type reference recovery 8054721512 Move DeclaredVariables to a better location 3851591642 [infra] Keep comments intact when updating status files. 7764e6962e Initial API to build analysis contexts (replaces ContextLocator.locateContexts) 5ea271bb01 Clean up documentation of implicit new/const insertions tests. cf93009caf Removed the magic const feature from implicit-creation.md bd39320b3b Recover from error on undefined continue label. 5d89a1ac32 Add tests for mixin application constructor forwarding. e6962790a1 Use import URIs when invalidating files 23c59bd819 Fix compare_failures 290cc58e71 Use actual receiver when error-wrapping a null-aware property get. 34763bc4c9 Reland "[VM] Introduction of type testing stubs - Part 1-4" a86b864fa9 Handle updated .packages in incremental compiler f555ae505a Trust type annotations in strong mode 0a4a3bed68 When cloning YieldStatement, copy the flags 91bbc798fa Skip abstract forwarding stubs 7689dc9e06 Bring in the latest pub_semver f71d204185 Fix expected type in substByContext 5e99872770 Improve missing/invalid type reference recovery 899dbe4dae Forward type arguments in one-shot interceptors. 1fd3011f47 dart2js: Add more whole-program information to dump-info 5e23c2843d Revert "[infra] Temporarily disable Windows SDK builder on CQ" 2471888d4a Serialize any MethodInvocation as possible const. b430570364 dart2js: handle constant casts with type variable substitutions 3575b810b3 Only add const in a constant context (issue 32819) 09f7d2aee5 dart2js: naive support for instantiations in constants - ignore the actual instantiation 4dd5e6e6ad js_runtime: fix _JsonMap keys list type 71ffe976a9 Correctly handle constant fields when computing constness (take 2) d58b0e2d44 [VM] Mark bigint test slow after small Smi change 1e997ee6b7 Revert "Reland "[VM] Introduction of type testing stubs - Part 1-4"" 00097adce0 Remove reference to deprecated setter cb065a116f [infra] Update checked-in SDK version to 2.0.0-dev.46.0 0e9a77a360 [VM] Reduce Smi size to 32 bit on 64 bit platforms 34bfefd508 [gardening] Update status file 969c0de335 Avoid crash on EOF error in file with Windows line encoding 8054409a02 Reland "[VM] Introduction of type testing stubs - Part 1-4" ``` --- DEPS | 8 ++++---- tools/licenses/lib/main.dart | 1 + travis/licenses_golden/licenses_third_party | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index aa3dc7026f0e5..9801e0fc4de80 100644 --- a/DEPS +++ b/DEPS @@ -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': '23ae4fa098a1c2011b72f5ad4d00383e1ac10a59', 'dart_args_tag': '1.4.1', 'dart_async_tag': '2.0.6', @@ -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', @@ -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', @@ -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', diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index e75c6c171958e..2cf747123ed40 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -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 diff --git a/travis/licenses_golden/licenses_third_party b/travis/licenses_golden/licenses_third_party index a7c8651437843..7d9f7ce6b8916 100644 --- a/travis/licenses_golden/licenses_third_party +++ b/travis/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 5e7a29bc2be55a7311df8f5a7dff2d34 +Signature: bea26d7863b6f1cfa1d0c0ae3775bf93 UNUSED LICENSES: From 5e709eab57661f3aaba2c2b9c0424e7ac5f739d5 Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 10 Apr 2018 17:04:55 -0700 Subject: [PATCH 2/2] Update license hash --- travis/licenses_golden/licenses_third_party | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/licenses_golden/licenses_third_party b/travis/licenses_golden/licenses_third_party index 7d9f7ce6b8916..470d479138d96 100644 --- a/travis/licenses_golden/licenses_third_party +++ b/travis/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: bea26d7863b6f1cfa1d0c0ae3775bf93 +Signature: f15f70e4cdde38e61887aa34721faf73 UNUSED LICENSES: