From fc27f80a12428d20c7f5689fd7e62b9a324b9c06 Mon Sep 17 00:00:00 2001 From: Siva Date: Wed, 21 Aug 2019 21:02:35 -0700 Subject: [PATCH] 1. Update license files to account for the new Dart License file (#11364) 2. Roll src/third_party/dart 027071318f..1279641cdd (65 commits) dart-lang/sdk@1279641cdd Migration: integrate for-each loops with flow analysis. dart-lang/sdk@51cd16ecf0 Flow analysis: support for and for-in elements in collections. dart-lang/sdk@47d2794a71 Implement methods that were missing from ExtensionElementForLink dart-lang/sdk@a17959b5a0 Log the context in which analysis work is done. dart-lang/sdk@9198813a55 Revert "Scaffolding for dart:wasm" dart-lang/sdk@4bf5a72ca0 Flow analysis: support functions whose bodies are expressions. dart-lang/sdk@b569bf048e Migration: node builder support for new-style typedefs. dart-lang/sdk@f39a3f188e Scaffolding for dart:wasm dart-lang/sdk@3729b961bb Use SearchedFiles when searching subtypes for 'analysis.implemented'. dart-lang/sdk@5d816cbc5d [vm/concurrency] Add FLAG_enable_isolate_groups, still defaulting to true dart-lang/sdk@480e481708 Throw HttpException instead of String in http impl dart-lang/sdk@9aa48c2e91 Build local elements in initializers of typed constants. dart-lang/sdk@af2e729fca Record request / response statistics. dart-lang/sdk@7bc9515ac2 Fix CompilationUnitMember doc comment. Fixes #27170 dart-lang/sdk@ef39492fd6 Fix support for annotations on extensions dart-lang/sdk@64efe44e5e Formal parameters of FunctionTypeAlias should be created in @function reference. dart-lang/sdk@0323fb97bc Migration: support Function() syntax with type formal parameters. dart-lang/sdk@19533094eb Stop deleting the terminating period on diagnostic messages dart-lang/sdk@d252efaa49 Migration: node builder support for old-style typedefs dart-lang/sdk@468800f9d7 Refine the type of FunctionTypeAlias.declaredElement. dart-lang/sdk@c44c2f1b68 Update LSP readme with instructions for shipped SDKs instead of source dart-lang/sdk@f2e04caeaf [CFE] Fix CQ race condition with lint status dart-lang/sdk@bc16959fc7 Reland "[vm/ffi] Dispatch native callbacks through trampolines if we can't ensure callbacks will always be executable." dart-lang/sdk@48edb2362a [CFE] Update lint for explicit types to also look at fields and top level fields dart-lang/sdk@5905fe41a9 [CFE] Explicit return types and overrides in constant evaluator dart-lang/sdk@698c5b1a36 [CFE] Add 'double import' lint dart-lang/sdk@b625152523 [infra] Remove non-essential test expectations from kernel status files dart-lang/sdk@c37b5b2edf [vm/ffi] Status: skip test including callbacks on DBC dart-lang/sdk@095d1c2835 [infra] Clean up general status files dart-lang/sdk@7f9f4ad774 [cfe] Delete legacy tests dart-lang/sdk@91c8cf7167 [cfe] Support per folder experimental flags in testcases dart-lang/sdk@670d40d808 [vm/ffi] regression test for 37511 dart-lang/sdk@c651102793 Remove third_party licenses from LICENSE dart-lang/sdk@5e5313c8d6 [vm/bytecode] Keep unreachable code for code coverage dart-lang/sdk@922c2bfbb0 [vm/bytecode] Include source info and asserts into platform with bytecode dart-lang/sdk@457c4349d0 [ package:vm_service ] Prep for 1.1.1 release dart-lang/sdk@861cae4853 [vm/fuzzer] Disable stacktrace option on FFI runs dart-lang/sdk@f50a566476 Enclose local variables in default values of optional formal parameters. dart-lang/sdk@239a6d1449 [vm, bytecode] Annotate super calls and clear lookup caches on reload. dart-lang/sdk@ee38a308da thread feature set into linter debug util dart-lang/sdk@afc259ea6b [dart2js] Add 'any' to DartType. dart-lang/sdk@1d9b6427ef Prepare to publish analyzer version 0.38.1. dart-lang/sdk@a5007cde35 Clean up an obsolete TODO comment dart-lang/sdk@293eee940b [dart2js] Revert to old Closure.toString() implementation for old RTI. dart-lang/sdk@f842b03de5 linter visit hooks for extensions dart-lang/sdk@3fe9ba152f Migration: implement Variables._decorateDirectSupertypes. dart-lang/sdk@d67eaefe77 Add more tests of the visibility of extension members dart-lang/sdk@72923471c4 strict-inference failures for untyped parameters: dart-lang/sdk@bfc7f8c4b5 Fix crash parsing invalid constructor initializer dart-lang/sdk@3e69627752 Fix type argument parsing crash dart-lang/sdk@e2777454cc Fix dartfmt bug dart-lang/sdk@d95bb2d74f [ package:vm_service ] Analyze package:vm_service on bots dart-lang/sdk@38ca72a3e7 [dart2js] TrivialRuntimeTypesNeed should not say non-generic classes need type arguments. dart-lang/sdk@04bd34ed87 Issue 37916. The name of ConstructorName cannot be shadowed. dart-lang/sdk@3865187956 [nnbd_migration] already-migrated types with 1:1 type args & params. dart-lang/sdk@e2fee9c0dd [pkg:vm_service] fix an issue serializing list args dart-lang/sdk@37183f8865 [observatory] Remove stale asserts from heap snapshot processing. dart-lang/sdk@396613d884 [pkg:vm_service] be more lenient towards nulls json fields in the java library dart-lang/sdk@0fee296130 [vm] Add wasmer to third_party, and support building rust libraries dart-lang/sdk@663a8630e6 Revert "[vm/ffi] Dispatch native callbacks through trampolines if we can't ensure callbacks will always be executable." dart-lang/sdk@e8c82c6784 [vm/ffi] Suppress irrelevant lint failures in FFI sources. dart-lang/sdk@bab592fd28 [vm/ffi] Dispatch native callbacks through trampolines if we can't ensure callbacks will always be executable. dart-lang/sdk@e34c4319dc Migration: property decorate implicit bottom types. dart-lang/sdk@c6e2497569 Migration: capture more exception information and make it easier to examine stack traces. dart-lang/sdk@fc16f8aa58 Apply flutter-engine patch to dump dart_package_config_tag version dart-lang/sdk@1e79aa6b7e Update LSP readme to link to dart-vim instructions --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 42 +++++++++++++++++++++++-- ci/licenses_golden/tool_signature | 2 +- sky/packages/sky_engine/LICENSE | 27 +++++++++++++++- tools/licenses/lib/main.dart | 9 ------ 5 files changed, 67 insertions(+), 15 deletions(-) diff --git a/DEPS b/DEPS index 2b33a822d2..0405a18db4 100644 --- a/DEPS +++ b/DEPS @@ -34,7 +34,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': '027071318ff1333fefcf7b4e475c10a8f68ebc0d', + 'dart_revision': '1279641cdd2c43e4c1a09d9c5052d0264ae5524b', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 65624674b6..8c1b5ee67f 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 7cb10c923a4e55c4725593b670e4e82f +Signature: 62b256d3ce5db5ab6fe733271ebc1871 UNUSED LICENSES: @@ -7373,7 +7373,8 @@ FILE: ../../../third_party/dart/sdk/lib/vmservice_libraries.json FILE: ../../../third_party/dart/third_party/7zip.tar.gz.sha1 FILE: ../../../third_party/dart/third_party/clang.tar.gz.sha1 ---------------------------------------------------------------------------------------------------- -Copyright 2012, the Dart project authors. All rights reserved. +Copyright 2012, the Dart project authors. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -7439,6 +7440,8 @@ FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.html FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.js FILE: ../../../third_party/dart/runtime/vm/catch_entry_moves_test.cc FILE: ../../../third_party/dart/runtime/vm/class_id.h +FILE: ../../../third_party/dart/runtime/vm/code_comments.cc +FILE: ../../../third_party/dart/runtime/vm/code_comments.h FILE: ../../../third_party/dart/runtime/vm/code_entry_kind.h FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.cc FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.h @@ -7494,6 +7497,8 @@ FILE: ../../../third_party/dart/runtime/vm/constants_x64.cc FILE: ../../../third_party/dart/runtime/vm/debugger_kbc.cc FILE: ../../../third_party/dart/runtime/vm/elf.cc FILE: ../../../third_party/dart/runtime/vm/elf.h +FILE: ../../../third_party/dart/runtime/vm/ffi_callback_trampolines.cc +FILE: ../../../third_party/dart/runtime/vm/ffi_callback_trampolines.h FILE: ../../../third_party/dart/runtime/vm/frame_layout.h FILE: ../../../third_party/dart/runtime/vm/intrusive_dlist.h FILE: ../../../third_party/dart/runtime/vm/intrusive_dlist_test.cc @@ -21629,6 +21634,37 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: wasmer +ORIGIN: ../../../third_party/dart/third_party/wasmer/LICENSE +TYPE: LicenseType.mit +FILE: ../../../third_party/dart/third_party/wasmer/Cargo.toml +FILE: ../../../third_party/dart/third_party/wasmer/wasmer.hh +FILE: ../../../third_party/dart/third_party/wasmer/wasmer.rs +---------------------------------------------------------------------------------------------------- +MIT License + +Copyright (c) 2019 Wasmer, Inc. and its affiliates. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +==================================================================================================== + ==================================================================================================== LIBRARY: wuffs ORIGIN: ../../../third_party/wuffs/LICENSE @@ -22578,4 +22614,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: 359 +Total license count: 360 diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 6c76b42e22..43d9a858d1 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 6094aeb823d406e3a1a7f3141a7fb188 +Signature: 2009f69daad0d2b8a8037b2903f145ee diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 65860b1645..1fed3946f8 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -4200,7 +4200,8 @@ license that can be found in the LICENSE file -------------------------------------------------------------------------------- dart -Copyright 2012, the Dart project authors. All rights reserved. +Copyright 2012, the Dart project authors. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -12516,6 +12517,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- +wasmer + +MIT License + +Copyright (c) 2019 Wasmer, Inc. and its affiliates. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +-------------------------------------------------------------------------------- wuffs Apache License diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index dae8994b26..b7f3826cb4 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -293,15 +293,6 @@ class _RepositoryDartLicenseFile extends _RepositorySingleLicenseFile { : super(parent, io, _parseLicense(io)); static final RegExp _pattern = RegExp( - r'^This license applies to all parts of Dart that are not externally\n' - r'maintained libraries\. The external maintained libraries used by\n' - r'Dart are:\n' - r'\n' - r'(?:.+\n)+' - r'\n' - r'The libraries may have their own licenses; we recommend you read them,\n' - r'as their terms may differ from the terms below\.\n' - r'\n' r'(Copyright (?:.|\n)+)$', caseSensitive: false ); -- GitLab