diff --git a/DEPS b/DEPS index 221d9f319c385..124274941c253 100644 --- a/DEPS +++ b/DEPS @@ -336,7 +336,7 @@ deps = { Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35', 'src/flutter/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'), + 'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'), 'src/flutter/third_party/perfetto': Var('flutter_git') + "/third_party/perfetto" + '@' + Var('dart_perfetto_rev'), @@ -695,6 +695,9 @@ deps = { 'src/flutter/third_party/pkg/archive': Var('chromium_git') + '/external/github.com/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2 + 'src/flutter/third_party/pkg/coverage': + Var('flutter_git') + '/third_party/coverage.git' + '@' + 'bb0ab721ee4ceef1abfa413d8d6fd46013b583b9', # 1.7.2 + 'src/flutter/third_party/pkg/equatable': Var('flutter_git') + '/third_party/equatable.git' + '@' + '2117551ff3054f8edb1a58f63ffe1832a8d25623', # 2.0.5 @@ -707,6 +710,12 @@ deps = { 'src/flutter/third_party/pkg/googleapis': Var('flutter_git') + '/third_party/googleapis.dart.git' + '@' + '526011f56d98eab183cc6075ee1392e8303e43e2', # various + 'src/flutter/third_party/pkg/io': + Var('flutter_git') + '/third_party/io.git' + '@' + '997a6243aad20af4238147d9ec00bf638b9169af', # 1.0.5-wip + + 'src/flutter/third_party/pkg/node_preamble': + Var('flutter_git') + '/third_party/node_preamble.dart.git' + '@' + '47245865175929ec452d8058e563c267b64c3d64', # 2.0.2 + 'src/flutter/third_party/pkg/platform': Var('dart_git') + '/platform.dart' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0 diff --git a/ci/licenses.sh b/ci/licenses.sh index c971050b67cf4..1f59876fe6b94 100755 --- a/ci/licenses.sh +++ b/ci/licenses.sh @@ -174,7 +174,7 @@ function verify_licenses() ( local actualLicenseCount actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')" - local expectedLicenseCount=879 # When changing this number: Update the error message below as well describing the newly expected license types. + local expectedLicenseCount=888 # When changing this number: Update the error message below as well describing the newly expected license types. if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then echo "=============================== ERROR ===============================" diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index a3b47fc20bb3f..429b126fbf6fa 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2155,10 +2155,38 @@ ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/OWNERS ../../../flutter/third_party/perfetto/ui/src/test ../../../flutter/third_party/pkg/archive +../../../flutter/third_party/pkg/coverage/.git +../../../flutter/third_party/pkg/coverage/.github +../../../flutter/third_party/pkg/coverage/.gitignore +../../../flutter/third_party/pkg/coverage/AUTHORS +../../../flutter/third_party/pkg/coverage/CHANGELOG.md +../../../flutter/third_party/pkg/coverage/PATENTS +../../../flutter/third_party/pkg/coverage/README.md +../../../flutter/third_party/pkg/coverage/analysis_options.yaml +../../../flutter/third_party/pkg/coverage/benchmark/.gitignore +../../../flutter/third_party/pkg/coverage/pubspec.yaml +../../../flutter/third_party/pkg/coverage/test ../../../flutter/third_party/pkg/equatable ../../../flutter/third_party/pkg/flutter_packages ../../../flutter/third_party/pkg/gcloud ../../../flutter/third_party/pkg/googleapis +../../../flutter/third_party/pkg/io/.git +../../../flutter/third_party/pkg/io/.github +../../../flutter/third_party/pkg/io/.gitignore +../../../flutter/third_party/pkg/io/AUTHORS +../../../flutter/third_party/pkg/io/CHANGELOG.md +../../../flutter/third_party/pkg/io/README.md +../../../flutter/third_party/pkg/io/analysis_options.yaml +../../../flutter/third_party/pkg/io/example +../../../flutter/third_party/pkg/io/pubspec.yaml +../../../flutter/third_party/pkg/io/test +../../../flutter/third_party/pkg/node_preamble/.git +../../../flutter/third_party/pkg/node_preamble/.gitignore +../../../flutter/third_party/pkg/node_preamble/CHANGELOG.md +../../../flutter/third_party/pkg/node_preamble/README.md +../../../flutter/third_party/pkg/node_preamble/example +../../../flutter/third_party/pkg/node_preamble/package.json +../../../flutter/third_party/pkg/node_preamble/pubspec.yaml ../../../flutter/third_party/pkg/platform ../../../flutter/third_party/pkg/process ../../../flutter/third_party/pkg/process_runner diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index d94f8f8c48356..453fe5063546c 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -35030,6 +35030,42 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/coverage/bin/format_coverage.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/coverage/bin/format_coverage.dart +---------------------------------------------------------------------------------------------------- +Copyright (c) 2013, 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 LLC 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: khronos ORIGIN: ../../../flutter/third_party/angle/src/third_party/khronos/GL/wglext.h @@ -35447,6 +35483,54 @@ use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/coverage/bin/collect_coverage.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/coverage.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/src/collect.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/src/formatter.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/src/hitmap.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/src/resolver.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/src/util.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/coverage/bin/collect_coverage.dart +FILE: ../../../flutter/third_party/pkg/coverage/lib/coverage.dart +FILE: ../../../flutter/third_party/pkg/coverage/lib/src/collect.dart +FILE: ../../../flutter/third_party/pkg/coverage/lib/src/formatter.dart +FILE: ../../../flutter/third_party/pkg/coverage/lib/src/hitmap.dart +FILE: ../../../flutter/third_party/pkg/coverage/lib/src/resolver.dart +FILE: ../../../flutter/third_party/pkg/coverage/lib/src/util.dart +---------------------------------------------------------------------------------------------------- +Copyright (c) 2014, 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 LLC 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: glslang ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.AMD.h @@ -35621,6 +35705,64 @@ FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/node_preamble/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/node_preamble/lib/preamble.dart +FILE: ../../../flutter/third_party/pkg/node_preamble/lib/preamble.js +FILE: ../../../flutter/third_party/pkg/node_preamble/lib/preamble.min.js +FILE: ../../../flutter/third_party/pkg/node_preamble/tool/minify.js +FILE: ../../../flutter/third_party/pkg/node_preamble/yarn.lock +---------------------------------------------------------------------------------------------------- +Copyright (c) 2015 Michael Bullington + +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. + + + +Copyright 2012, the Dart project 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. +==================================================================================================== + ==================================================================================================== LIBRARY: boringssl ORIGIN: ../../../flutter/third_party/boringssl/err_data.c @@ -35725,6 +35867,42 @@ use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/src/run_and_collect.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/coverage/lib/src/run_and_collect.dart +---------------------------------------------------------------------------------------------------- +Copyright (c) 2015, 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 LLC 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: fiat ORIGIN: ../../../flutter/third_party/boringssl/src/third_party/fiat/LICENSE @@ -35978,6 +36156,42 @@ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/coverage/bin/run_and_collect.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/coverage/bin/run_and_collect.dart +---------------------------------------------------------------------------------------------------- +Copyright (c) 2017, 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 LLC 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: boringssl ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/hrss/asm/poly_rq_mul.S @@ -36491,6 +36705,42 @@ 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: pkg +ORIGIN: ../../../flutter/third_party/pkg/coverage/lib/src/chrome.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/coverage/lib/src/chrome.dart +---------------------------------------------------------------------------------------------------- +Copyright (c) 2020, 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 LLC 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: etc_decoder ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/etc_decoder.h @@ -36791,6 +37041,46 @@ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/coverage/benchmark/many_isolates.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/benchmark/run_benchmarks.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/coverage/bin/test_with_coverage.dart + ../../../flutter/third_party/pkg/coverage/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/coverage/benchmark/many_isolates.dart +FILE: ../../../flutter/third_party/pkg/coverage/benchmark/run_benchmarks.dart +FILE: ../../../flutter/third_party/pkg/coverage/bin/test_with_coverage.dart +---------------------------------------------------------------------------------------------------- +Copyright (c) 2022, 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 LLC 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: boringssl ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_sysreg.c @@ -47019,6 +47309,58 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/io/lib/ansi.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/io.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/ansi_code.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/copy_path.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/exit_code.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/permissions.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/process_manager.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/shared_stdin.dart + ../../../flutter/third_party/pkg/io/LICENSE +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/shell_words.dart + ../../../flutter/third_party/pkg/io/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/io/lib/ansi.dart +FILE: ../../../flutter/third_party/pkg/io/lib/io.dart +FILE: ../../../flutter/third_party/pkg/io/lib/src/ansi_code.dart +FILE: ../../../flutter/third_party/pkg/io/lib/src/copy_path.dart +FILE: ../../../flutter/third_party/pkg/io/lib/src/exit_code.dart +FILE: ../../../flutter/third_party/pkg/io/lib/src/permissions.dart +FILE: ../../../flutter/third_party/pkg/io/lib/src/process_manager.dart +FILE: ../../../flutter/third_party/pkg/io/lib/src/shared_stdin.dart +FILE: ../../../flutter/third_party/pkg/io/lib/src/shell_words.dart +---------------------------------------------------------------------------------------------------- +Copyright 2017, 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 LLC 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: libwebp ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cost_neon.c + ../../../flutter/third_party/libwebp/COPYING @@ -49652,6 +49994,42 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: pkg +ORIGIN: ../../../flutter/third_party/pkg/io/lib/src/charcodes.dart + ../../../flutter/third_party/pkg/io/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/pkg/io/lib/src/charcodes.dart +---------------------------------------------------------------------------------------------------- +Copyright 2021, 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 LLC 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: angle ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.cpp + ../../../flutter/third_party/angle/LICENSE @@ -67151,4 +67529,4 @@ Disclaimer and license similar terms. ==================================================================================================== -Total license count: 879 +Total license count: 888 diff --git a/testing/pkg_test_demo/README.md b/testing/pkg_test_demo/README.md new file mode 100644 index 0000000000000..85f548c9d52b4 --- /dev/null +++ b/testing/pkg_test_demo/README.md @@ -0,0 +1,32 @@ +# Demo of `package:test` with `DEPS`-vendored packages + +Historically, `flutter/engine` used a homegrown test framework, +[`package:litetest`](../litetest/) to avoid depending on the unwieldy set of +dependencies that `package:test` brings in. However, `package:test` is now +vendored in `DEPS` (used by the Dart SDK).' + +This demo shows that: + +- It's possible to use `package:test` with entirely local dependencies. +- The functionality of `package:test` (such as filtering, IDE integration, etc.) + is available. + +See for details. + +## Usage + +Navigate to this directory: + +```sh +cd testing/pkg_test_demo +``` + +And run the tests using `dart test`[^1]: + +```sh +dart test +``` + +[^1]: + In practice, you'll want to use the `dart` binary that is vendored in the + pre-built SDK. diff --git a/testing/pkg_test_demo/pubspec.yaml b/testing/pkg_test_demo/pubspec.yaml new file mode 100644 index 0000000000000..aca16b980b8a1 --- /dev/null +++ b/testing/pkg_test_demo/pubspec.yaml @@ -0,0 +1,117 @@ +# Copyright 2013 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +name: pkg_test_demo +publish_to: none + +# Do not add any dependencies that require more than what is provided in +# //third_party/dart/pkg or //third_party/dart/third_party/pkg. + +# If you do add packages here, make sure you can run `pub get --offline`, and +# check the .packages and .package_config to make sure all the paths are +# relative to this directory into //third_party/dart + +environment: + sdk: '>=3.2.0-0 <4.0.0' + +dev_dependencies: + test: + +dependency_overrides: + _fe_analyzer_shared: + path: ../../../third_party/dart/pkg/_fe_analyzer_shared + _macros: + path: ../../../third_party/dart/pkg/_macros + analyzer: + path: ../../../third_party/dart/pkg/analyzer + args: + path: ../../../third_party/dart/third_party/pkg/args + async: + path: ../../../third_party/dart/third_party/pkg/async + boolean_selector: + path: ../../../third_party/dart/third_party/pkg/boolean_selector + collection: + path: ../../../third_party/dart/third_party/pkg/collection + convert: + path: ../../../third_party/dart/third_party/pkg/convert + coverage: + path: ../../third_party/pkg/coverage + crypto: + path: ../../../third_party/dart/third_party/pkg/crypto + file: + path: ../../../third_party/dart/third_party/pkg/file/packages/file + frontend_server_client: + path: ../../../third_party/dart/third_party/pkg/webdev/frontend_server_client + glob: + path: ../../../third_party/dart/third_party/pkg/glob + http_multi_server: + path: ../../../third_party/dart/third_party/pkg/http_multi_server + http_parser: + path: ../../../third_party/dart/third_party/pkg/http_parser + io: + path: ../../third_party/pkg/io + js: + path: ../../../third_party/dart/pkg/js + logging: + path: ../../../third_party/dart/third_party/pkg/logging + macros: + path: ../../../third_party/dart/pkg/macros + matcher: + path: ../../../third_party/dart/third_party/pkg/matcher + meta: + path: ../../../third_party/dart/pkg/meta + mime: + path: ../../../third_party/dart/third_party/pkg/mime + node_preamble: + path: ../../third_party/pkg/node_preamble + package_config: + path: ../../../third_party/dart/third_party/pkg/package_config + path: + path: ../../../third_party/dart/third_party/pkg/path + pool: + path: ../../../third_party/dart/third_party/pkg/pool + pub_semver: + path: ../../../third_party/dart/third_party/pkg/pub_semver + shelf: + path: ../../../third_party/dart/third_party/pkg/shelf/pkgs/shelf + shelf_packages_handler: + path: ../../../third_party/dart/third_party/pkg/shelf/pkgs/shelf_packages_handler + shelf_static: + path: ../../../third_party/dart/third_party/pkg/shelf/pkgs/shelf_static + shelf_web_socket: + path: ../../../third_party/dart/third_party/pkg/shelf/pkgs/shelf_web_socket + source_map_stack_trace: + path: ../../../third_party/dart/third_party/pkg/source_map_stack_trace + source_maps: + path: ../../../third_party/dart/third_party/pkg/source_maps + source_span: + path: ../../../third_party/dart/third_party/pkg/source_span + stack_trace: + path: ../../../third_party/dart/third_party/pkg/stack_trace + stream_channel: + path: ../../../third_party/dart/third_party/pkg/stream_channel + string_scanner: + path: ../../../third_party/dart/third_party/pkg/string_scanner + term_glyph: + path: ../../../third_party/dart/third_party/pkg/term_glyph + test: + path: ../../../third_party/dart/third_party/pkg/test/pkgs/test + test_api: + path: ../../../third_party/dart/third_party/pkg/test/pkgs/test_api + test_core: + path: ../../../third_party/dart/third_party/pkg/test/pkgs/test_core + typed_data: + path: ../../../third_party/dart/third_party/pkg/typed_data + vm_service: + path: ../../../third_party/dart/pkg/vm_service + watcher: + path: ../../../third_party/dart/third_party/pkg/watcher + web: + path: ../../../third_party/dart/third_party/pkg/web + web_socket_channel: + path: ../../../third_party/dart/third_party/pkg/web_socket_channel + webkit_inspection_protocol: + path: ../../../third_party/dart/third_party/pkg/webkit_inspection_protocol + yaml: + path: ../../../third_party/dart/third_party/pkg/yaml diff --git a/testing/pkg_test_demo/test/example_test.dart b/testing/pkg_test_demo/test/example_test.dart new file mode 100644 index 0000000000000..01343d549eb58 --- /dev/null +++ b/testing/pkg_test_demo/test/example_test.dart @@ -0,0 +1,17 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:test/test.dart'; + +void main() { + test('String.split() splits the string on the delimiter', () { + const String string = 'foo,bar,baz'; + expect(string.split(','), equals(['foo', 'bar', 'baz'])); + }); + + test('String.trim() removes surrounding whitespace', () { + const String string = ' foo '; + expect(string.trim(), equals('foo')); + }); +} diff --git a/testing/run_tests.py b/testing/run_tests.py index 25af03c2eb3b1..25040a58aa97a 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -937,6 +937,7 @@ def build_dart_host_test_list(build_dir): ], ), (os.path.join('flutter', 'testing', 'litetest'), []), + (os.path.join('flutter', 'testing', 'pkg_test_demo'), []), (os.path.join('flutter', 'testing', 'skia_gold_client'), []), (os.path.join('flutter', 'testing', 'scenario_app'), []), ( diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py index f77e59d7d9577..a5b70a1ba9fa9 100644 --- a/tools/pub_get_offline.py +++ b/tools/pub_get_offline.py @@ -26,6 +26,7 @@ os.path.join(ENGINE_DIR, 'testing', 'benchmark'), os.path.join(ENGINE_DIR, 'testing', 'dart'), os.path.join(ENGINE_DIR, 'testing', 'litetest'), + os.path.join(ENGINE_DIR, 'testing', 'pkg_test_demo'), os.path.join(ENGINE_DIR, 'testing', 'scenario_app'), os.path.join(ENGINE_DIR, 'testing', 'skia_gold_client'), os.path.join(ENGINE_DIR, 'testing', 'smoke_test_failure'), @@ -92,6 +93,7 @@ def check_package(package): os.path.join(ENGINE_DIR, 'shell', 'platform', 'fuchsia'), os.path.join(ENGINE_DIR, 'shell', 'vmservice'), os.path.join(ENGINE_DIR, 'sky', 'packages'), + os.path.join(ENGINE_DIR, 'testing', 'pkg_test_demo'), os.path.join(ENGINE_DIR, 'third_party'), os.path.join(ENGINE_DIR, 'web_sdk'), ]