From ee5279217a445f1f2bee7b4f3c1d76443df1cf4d Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 18 Apr 2023 21:12:20 -0700 Subject: [PATCH] Roll dart, zlib, emscripten, tweak license script for rolled zlib (flutter/engine#41299) Changes since last dart roll ``` 1f224df52be Version 3.1.0-15.0.dev 3c284a0c95c Revert "Reland "[VM] Begin supporting Perfetto file recorder"" 754aca00499 Bump github/codeql-action from 2.2.11 to 2.2.12 7c8e61104f6 Bump actions/checkout from 3.5.0 to 3.5.2 f9f1030959d (origin/base) [infra] DEPS and test dart-lang/native packages b04b0844067 [vm/win7] Dynamically load functions for unwinding instructions. a6ebd6fa8e9 Bump tools to 545d7e1c73ce21b8c91f638021f9d487d324a501 c4795a75508 [vm, compiler] Don't do safepoint transitions in generated code under TSAN. 2fcf9754032 Version 3.1.0-14.0.dev 393b1016292 Version 3.1.0-13.0.dev 39fc15a0b4c (origin/lkgr) [analysis_server] Add missing declaration semantic token modifier on classes/constructors 609db33dc7a Issue 51985. Quick fix to add missing pattern case to switch expression/pattern. 8fa08ae80b6 Add 'Convert to if-case statement' quick assist. 17d92f90d0b offer wildcard suggestions for destructured record fields 3149f813bbf [dartdev] Update --enable-analytics to re-enable unified analytics eee509140dd Add dependency overrides for pkg/analyzer 3069c4f3e2b [analysis_server] Add missing "constructor" semantic token modifiers on constructor declarations 9834f87c542 [dart2js] Fix noSuchMethod override handling. 639a6f06ef9 Simplify several non-terminals to use regex-like grammar operators f88e3bd77c5 Issue 51903. Test fixes for ParserErrorCode.VAR_AND_TYPE f4d42303ad2 [analysis_server] Handle completion in whitespace after string values 70762f0de0e [ANTLR] Transform recursive definition of onParts to use iteration ... 453647022f6 [analysis_server] Don't fail on invalid/complex setters in LSP code completion a565638b910 Issue 51689. Report when 'super' is used as a standalone expression, not as a receiver of an invocation. b78d89ce0c7 Fix DynamicTypeImpl to InterfaceTypeImpl cast exception in AddTypeAnnotation, when ambiguous SetOrMapLiteral. bd9c7a46e2b Roll zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f 18b5ecdfc99 [vm] Cleanup dead code around TypeArgumentClassFinder 9d4d48949c0 Add a top-level variable strict-inference test case 8df1b888771 [VM/Service] Create JSONBase64String class b4aa83b0b7f [VM/Service] Rename JSONStream::AppendSerializedObject to JSONStream::AppendBytes 4cd9c9c6666 Reland "[VM] Begin supporting Perfetto file recorder" fa3a72fa7e5 [cfe/ffi] Error on compound constructors ``` --- DEPS | 10 +- .../flutter/ci/licenses_golden/excluded_files | 5 + .../flutter/ci/licenses_golden/tool_signature | 2 +- .../flutter/sky/packages/sky_engine/LICENSE | 130 +++++++++++++----- engine/src/flutter/tools/activate_emsdk.py | 2 +- .../src/flutter/tools/licenses/lib/paths.dart | 1 + .../flutter/tools/licenses/lib/patterns.dart | 6 +- 7 files changed, 108 insertions(+), 48 deletions(-) diff --git a/DEPS b/DEPS index 37606624ed..7d8382a956 100644 --- a/DEPS +++ b/DEPS @@ -47,7 +47,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': 'a335e6724332400693e23808845ae0533730552d', + 'dart_revision': '1f224df52bee4f120ad1600e78a731face84d76d', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -68,7 +68,7 @@ vars = { 'dart_webdev_rev': '75462913fba9756e9ddae33bfd73fe96f5199c34', 'dart_webkit_inspection_protocol_rev': '8401098ace995e4dcd9855a2741c2dacccaa780b', 'dart_yaml_edit_rev': '5f392a1511ab97dde0e4a6bb7225f283f59ea840', - 'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda', + 'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f', 'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1 @@ -319,7 +319,7 @@ deps = { Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b9b5f162ca8bf5b899ff0f0351491d7d403d7ed9', 'src/third_party/dart/third_party/devtools': - {'packages': [{'version': 'git_revision:026f0adf03725fbab24d601ac74c811808f258e5', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'}, + {'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:026f0adf03725fbab24d601ac74c811808f258e5'}], 'dep_type': 'cipd'}, 'src/third_party/dart/third_party/pkg/args': Var('dart_git') + '/args.git@5ac2ba1d93f037c7aee2975703bf071f88597a76', @@ -487,7 +487,7 @@ deps = { Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'), 'src/third_party/dart/tools/sdks': - {'packages': [{'version': 'version:3.0.0-369.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'}, + {'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.0.0-369.0.dev'}], 'dep_type': 'cipd'}, # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py. @@ -769,7 +769,7 @@ deps = { }, 'src/buildtools/emsdk': { - 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'fc645b7626ebf86530dbd82fbece74d457e7ae07', + 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'da9699832b5df4e123403490e499c87000c22654', 'condition': 'download_emsdk', }, diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index 963bb80d50..f0437972a8 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -2308,6 +2308,8 @@ ../../../third_party/libpng/aclocal.m4 ../../../third_party/libpng/contrib ../../../third_party/libpng/libpng-manual.txt +../../../third_party/libpng/libpng.3 +../../../third_party/libpng/libpngpf.3 ../../../third_party/libpng/mips ../../../third_party/libpng/png.5 ../../../third_party/libpng/powerpc @@ -3043,11 +3045,13 @@ ../../../third_party/wuffs/sync.txt ../../../third_party/yapf ../../../third_party/zlib/.git +../../../third_party/zlib/CMakeLists.txt ../../../third_party/zlib/DIR_METADATA ../../../third_party/zlib/OWNERS ../../../third_party/zlib/README.chromium ../../../third_party/zlib/contrib/bench/OWNERS ../../../third_party/zlib/contrib/minizip/Makefile +../../../third_party/zlib/contrib/minizip/README.chromium ../../../third_party/zlib/contrib/minizip/miniunz.c ../../../third_party/zlib/contrib/minizip/minizip.c ../../../third_party/zlib/contrib/minizip/minizip.md @@ -3059,4 +3063,5 @@ ../../../third_party/zlib/google/zip_reader_unittest.cc ../../../third_party/zlib/google/zip_unittest.cc ../../../third_party/zlib/patches/README +../../../third_party/zlib/zlib.3 ../../../tools diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index 09e63acdce..0e38359cbf 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 61adfda2905179c8e8b7d754d8660a7f +Signature: aabe540615f08ecf9c89970cdec802bc diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index 7bdf0ac462..c3374846a3 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -15982,7 +15982,7 @@ POSSIBILITY OF SUCH DAMAGE. zlib Copyright (C) 2017 ARM, Inc. -Copyright 2017 The Chromium Authors. All rights reserved. +Copyright 2017 The Chromium Authors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -22037,7 +22037,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- accessibility angle -zlib Copyright (c) 2011 The Chromium Authors. All rights reserved. @@ -22228,7 +22227,6 @@ use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. -------------------------------------------------------------------------------- accessibility -zlib Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -23895,36 +23893,6 @@ 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. -------------------------------------------------------------------------------- -zlib - -Copyright (c) 2022 The Chromium Authors. 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. --------------------------------------------------------------------------------- dart Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file @@ -25829,7 +25797,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. accessibility angle icu -zlib Copyright 2014 The Chromium Authors. All rights reserved. @@ -26460,9 +26427,38 @@ 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. -------------------------------------------------------------------------------- +zlib + +Copyright 2017 The Chromium Authors + +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. +-------------------------------------------------------------------------------- accessibility angle -zlib Copyright 2017 The Chromium Authors. All rights reserved. @@ -26798,6 +26794,36 @@ met: 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. +-------------------------------------------------------------------------------- +zlib + +Copyright 2018 The Chromium Authors + +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 @@ -26814,7 +26840,6 @@ accessibility angle fuchsia_sdk skia -zlib Copyright 2018 The Chromium Authors. All rights reserved. @@ -27121,6 +27146,36 @@ met: 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. +-------------------------------------------------------------------------------- +zlib + +Copyright 2019 The Chromium Authors + +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 @@ -27135,7 +27190,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- accessibility fuchsia_sdk -zlib Copyright 2019 The Chromium Authors. All rights reserved. @@ -27928,7 +27982,7 @@ POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- zlib -Copyright 2022 The Chromium Authors. All rights reserved. +Copyright 2022 The Chromium Authors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/engine/src/flutter/tools/activate_emsdk.py b/engine/src/flutter/tools/activate_emsdk.py index 9b4e3aefcc..9b0d11dbf7 100644 --- a/engine/src/flutter/tools/activate_emsdk.py +++ b/engine/src/flutter/tools/activate_emsdk.py @@ -16,7 +16,7 @@ EMSDK_ROOT = os.path.abspath( EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py') # See lib/web_ui/README.md for instructions on updating the EMSDK version. -EMSDK_VERSION = '3.1.3' +EMSDK_VERSION = '3.1.32' def main(): diff --git a/engine/src/flutter/tools/licenses/lib/paths.dart b/engine/src/flutter/tools/licenses/lib/paths.dart index 5e136a1107..fe9bd5154d 100644 --- a/engine/src/flutter/tools/licenses/lib/paths.dart +++ b/engine/src/flutter/tools/licenses/lib/paths.dart @@ -410,6 +410,7 @@ final Set skippedCommonFiles = { // Keep this list in lexical order. final Set skippedCommonExtensions = { r'.1', + r'.3', r'.5', r'.autopkg', r'.build', diff --git a/engine/src/flutter/tools/licenses/lib/patterns.dart b/engine/src/flutter/tools/licenses/lib/patterns.dart index cba12a213a..f3a1c0fb34 100644 --- a/engine/src/flutter/tools/licenses/lib/patterns.dart +++ b/engine/src/flutter/tools/licenses/lib/patterns.dart @@ -49,8 +49,8 @@ final RegExp copyrightMentionOkPattern = RegExp( r'|// The copyright below was added in 2009, but I see no record' r'|This ICU code derived from:' r'|the contents of which are also included in zip.h' // seen in minizip's unzip.c, but the upshot of the crazy license situation there is that we don't have to do anything - r'|" inflate 1\.2\.12 Copyright 1995-2022 Mark Adler ";' - r'|" deflate 1\.2\.12 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";' + r'|" inflate 1\.2\.1\d Copyright 1995-2022 Mark Adler ";' + r'|" deflate 1\.2\.1\d Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";' r'|const char zip_copyright\[\] =" zip 1\.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";' r'|#define JCOPYRIGHT_SHORT "Copyright \(C\) 1991-2016 The libjpeg-turbo Project and many others"' r"|r'[^']*©[^']*'" // e.g. flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart @@ -330,7 +330,7 @@ final List csReferencesByFilename =