未验证 提交 834d6eb0 编写于 作者: A Alexander Markov 提交者: GitHub

Roll Dart to 223eeb2ebe112aaaddca206aab55cd54b4e54391 (#4659)

* Roll Dart to 223eeb2ebe112aaaddca206aab55cd54b4e54391
* Update licenses
* Make analyzer happy, fix test for change in mockito
上级 f5a4a937
......@@ -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': '32396138ff733cbe8d9ac32178e6cffccdf80644',
'dart_revision': '223eeb2ebe112aaaddca206aab55cd54b4e54391',
'dart_args_tag': '0.13.7',
'dart_async_tag': 'corelib_2_2_1',
......@@ -48,7 +48,7 @@ vars = {
'dart_csslib_tag': '0.14.1',
'dart_dart2js_info_tag': '0.5.5+1',
'dart_dart_style_tag': '1.0.9',
'dart_dartdoc_tag': 'v0.15.1',
'dart_dartdoc_tag': 'v0.16.0',
'dart_fixnum_tag': '0.10.5',
'dart_glob_tag': '1.1.5',
'dart_html_tag': '0.13.2+2',
......@@ -60,12 +60,12 @@ 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.42',
'dart_linter_tag': '0.1.43',
'dart_logging_tag': '0.11.3+1',
'dart_markdown_tag': '1.0.0',
'dart_matcher_tag': '0.12.1+4',
'dart_mime_tag': '0.9.6',
'dart_mockito_tag': '2.0.2',
'dart_mockito_tag': 'a92db054fba18bc2d605be7670aee74b7cadc00a',
'dart_mustache4dart_tag': 'v2.1.0',
'dart_oauth2_tag': '1.1.0',
'dart_observatory_pub_packages_rev': '4c282bb240b68f407c8c7779a65c68eeb0139dc6',
......
......@@ -240,10 +240,10 @@ Future<int> main() async {
await recompileCalled.first;
verifyInOrder(
<dynamic>[
<void>[
compiler.invalidate(Uri.base.resolve('file1.dart')),
compiler.invalidate(Uri.base.resolve('file2.dart')),
compiler.recompileDelta(),
await compiler.recompileDelta(),
]
);
streamController.close();
......@@ -314,12 +314,12 @@ Future<int> main() async {
streamController.add('recompile def\nfile2.dart\nfile3.dart\ndef\n'.codeUnits);
await recompileCalled.first;
verifyInOrder(<dynamic>[
compiler.compile('file1.dart', any, generator: any),
verifyInOrder(<void>[
await compiler.compile('file1.dart', any, generator: any),
compiler.acceptLastDelta(),
compiler.invalidate(Uri.base.resolve('file2.dart')),
compiler.invalidate(Uri.base.resolve('file3.dart')),
compiler.recompileDelta(),
await compiler.recompileDelta(),
]);
streamController.close();
});
......@@ -360,9 +360,8 @@ Future<int> main() async {
final _MockedIncrementalKernelGenerator generator =
new _MockedIncrementalKernelGenerator();
when(generator.computeDelta()).thenReturn(new Future<Program>.value(
new Program()
));
when(generator.computeDelta())
.thenAnswer((_) => new Future<Program>.value(new Program()));
final _MockedBinaryPrinterFactory printerFactory =
new _MockedBinaryPrinterFactory();
when(printerFactory.newBinaryPrinter(any))
......
Signature: b010c0daafa064367e018dfda4dbd283
Signature: db149000edafc6c8da6aecf26175818f
UNUSED LICENSES:
......@@ -4654,6 +4654,7 @@ FILE: ../../../third_party/dart/sdk/lib/html/html_common/css_class_set.dart
FILE: ../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart
FILE: ../../../third_party/dart/sdk/lib/html/html_common/metadata.dart
FILE: ../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
FILE: ../../../third_party/dart/sdk/lib/internal/async_cast.dart
FILE: ../../../third_party/dart/sdk/lib/internal/cast.dart
FILE: ../../../third_party/dart/sdk/lib/internal/internal.dart
FILE: ../../../third_party/dart/sdk/lib/io/common.dart
......@@ -5356,6 +5357,40 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: dart
ORIGIN: ../../../third_party/dart/sdk/lib/typed_data/unmodifiable_typed_data.dart + ../../../third_party/dart/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/dart/sdk/lib/typed_data/unmodifiable_typed_data.dart
----------------------------------------------------------------------------------------------------
Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
for details. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: double-conversion
ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/src/bignum-dtoa.cc
......@@ -21974,4 +22009,4 @@ freely, subject to the following restrictions:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
Total license count: 309
Total license count: 310
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册