From 32c468507b328fc0db2175e35054ba4475253f8c Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 3 Jan 2023 18:04:38 -0800 Subject: [PATCH] Roll quiver to 3.2.1 (#38617) Need to roll quiver to a version that doesn't depend on BidirectionalIterator, which is being removed in https://dart-review.googlesource.com/c/sdk/+/276741?tab=checks. --- DEPS | 2 +- ci/licenses_golden/excluded_files | 16 +--- ci/licenses_golden/licenses_third_party | 99 +------------------------ ci/licenses_golden/tool_signature | 2 +- shell/platform/fuchsia/dart/BUILD.gn | 9 +-- tools/licenses/lib/paths.dart | 1 + 6 files changed, 8 insertions(+), 121 deletions(-) diff --git a/DEPS b/DEPS index 3bee0c7281065..8383bdfceb92b 100644 --- a/DEPS +++ b/DEPS @@ -632,7 +632,7 @@ deps = { Var('github_git') + '/google/process_runner.git' + '@' + 'd632ea0bfd814d779fcc53a361ed33eaf3620a0b', # 4.0.1 'src/third_party/pkg/quiver': - Var('github_git') + '/google/quiver-dart.git' + '@' + '66f473cca1332496e34a783ba4527b04388fd561', # 2.1.5 + Var('github_git') + '/google/quiver-dart.git' + '@' + '90b92bee895e507d435012356a8b5c5f17eafa52', # 3.2.1 'src/third_party/pkg/vector_math': Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0 diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index b5892700c70ad..4a1e7c293452b 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2345,21 +2345,7 @@ ../../../third_party/pkg/platform ../../../third_party/pkg/process ../../../third_party/pkg/process_runner -../../../third_party/pkg/quiver/.git -../../../third_party/pkg/quiver/.gitattributes -../../../third_party/pkg/quiver/.github -../../../third_party/pkg/quiver/.gitignore -../../../third_party/pkg/quiver/.travis.yml -../../../third_party/pkg/quiver/AUTHORS -../../../third_party/pkg/quiver/CHANGELOG.md -../../../third_party/pkg/quiver/CONTRIBUTING.md -../../../third_party/pkg/quiver/PATENTS -../../../third_party/pkg/quiver/README.md -../../../third_party/pkg/quiver/analysis_options.yaml -../../../third_party/pkg/quiver/dart_test.yaml -../../../third_party/pkg/quiver/lib/testing -../../../third_party/pkg/quiver/pubspec.yaml -../../../third_party/pkg/quiver/test +../../../third_party/pkg/quiver ../../../third_party/pkg/vector_math ../../../third_party/pyyaml ../../../third_party/rapidjson/.git diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 02c2645990520..2499b92ca84b8 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: af42eb900d317d9812456d1da10ffb70 +Signature: f1d6c82f3cba39cb558775d99f3b207b ==================================================================================================== LIBRARY: angle @@ -278,7 +278,6 @@ LIBRARY: flatbuffers LIBRARY: fuchsia-vulkan LIBRARY: glslang LIBRARY: khronos -LIBRARY: pkg LIBRARY: shaderc LIBRARY: spirv-cross LIBRARY: vulkan-headers @@ -670,54 +669,6 @@ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/fuchsia-vulkan/include/vulkan/vk_sdk_platform.h ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/khronos/GLES2/gl2platform.h ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/khronos/GLES3/gl3platform.h -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/async.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/cache.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/check.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/collection.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/core.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/io.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/iterables.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/mirrors.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/pattern.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/collect.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/concat.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/countdown_timer.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/enumerate.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/future_stream.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/iteration.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/metronome.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/stream_buffer.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/stream_router.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/string.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/cache/cache.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/cache/map_cache.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/bimap.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/iterable.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/list.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/map.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/queue.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/set.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/lru_map.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/multimap.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/treeset.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/core/hash.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/core/optional.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/concat.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/count.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/cycle.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/enumerate.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/generating_iterable.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/infinite_iterable.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/merge.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/min_max.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/partition.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/range.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/zip.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/time/clock.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/time/duration_unit_constants.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/time/util.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/strings.dart -ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/time.dart ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/shaderc/android_test/test.cpp ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/shaderc/glslc/src/dependency_info.cc ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/shaderc/glslc/src/dependency_info.h @@ -2364,54 +2315,6 @@ FILE: ../../../third_party/khronos/EGL/eglext.h FILE: ../../../third_party/khronos/EGL/eglplatform.h FILE: ../../../third_party/khronos/GLES2/gl2platform.h FILE: ../../../third_party/khronos/GLES3/gl3platform.h -FILE: ../../../third_party/pkg/quiver/lib/async.dart -FILE: ../../../third_party/pkg/quiver/lib/cache.dart -FILE: ../../../third_party/pkg/quiver/lib/check.dart -FILE: ../../../third_party/pkg/quiver/lib/collection.dart -FILE: ../../../third_party/pkg/quiver/lib/core.dart -FILE: ../../../third_party/pkg/quiver/lib/io.dart -FILE: ../../../third_party/pkg/quiver/lib/iterables.dart -FILE: ../../../third_party/pkg/quiver/lib/mirrors.dart -FILE: ../../../third_party/pkg/quiver/lib/pattern.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/collect.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/concat.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/countdown_timer.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/enumerate.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/future_stream.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/iteration.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/metronome.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/stream_buffer.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/stream_router.dart -FILE: ../../../third_party/pkg/quiver/lib/src/async/string.dart -FILE: ../../../third_party/pkg/quiver/lib/src/cache/cache.dart -FILE: ../../../third_party/pkg/quiver/lib/src/cache/map_cache.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/bimap.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/iterable.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/list.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/map.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/queue.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/set.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/lru_map.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/multimap.dart -FILE: ../../../third_party/pkg/quiver/lib/src/collection/treeset.dart -FILE: ../../../third_party/pkg/quiver/lib/src/core/hash.dart -FILE: ../../../third_party/pkg/quiver/lib/src/core/optional.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/concat.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/count.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/cycle.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/enumerate.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/generating_iterable.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/infinite_iterable.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/merge.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/min_max.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/partition.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/range.dart -FILE: ../../../third_party/pkg/quiver/lib/src/iterables/zip.dart -FILE: ../../../third_party/pkg/quiver/lib/src/time/clock.dart -FILE: ../../../third_party/pkg/quiver/lib/src/time/duration_unit_constants.dart -FILE: ../../../third_party/pkg/quiver/lib/src/time/util.dart -FILE: ../../../third_party/pkg/quiver/lib/strings.dart -FILE: ../../../third_party/pkg/quiver/lib/time.dart FILE: ../../../third_party/shaderc/DEVELOPMENT.howto.md FILE: ../../../third_party/shaderc/android_test/test.cpp FILE: ../../../third_party/shaderc/downloads.md diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 595d34e913347..ce13f97cfc8ce 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 00d569c39c5ea2c3160c0e500196dd7e +Signature: 3178ef16b4b2174991a8ce7cee53c769 diff --git a/shell/platform/fuchsia/dart/BUILD.gn b/shell/platform/fuchsia/dart/BUILD.gn index a1315a738c19a..0a190839eb020 100644 --- a/shell/platform/fuchsia/dart/BUILD.gn +++ b/shell/platform/fuchsia/dart/BUILD.gn @@ -286,7 +286,7 @@ dart_library("quiver") { package_name = "quiver" # The current version of this library is not null safe - language_version = "2.0" + language_version = "2.17" deps = [ ":matcher", @@ -299,16 +299,13 @@ dart_library("quiver") { "check.dart", "collection.dart", "core.dart", - "io.dart", "iterables.dart", - "mirrors.dart", "pattern.dart", "src/async/collect.dart", "src/async/concat.dart", "src/async/countdown_timer.dart", "src/async/enumerate.dart", "src/async/future_stream.dart", - "src/async/iteration.dart", "src/async/metronome.dart", "src/async/stream_buffer.dart", "src/async/stream_router.dart", @@ -324,8 +321,10 @@ dart_library("quiver") { "src/collection/lru_map.dart", "src/collection/multimap.dart", "src/collection/treeset.dart", + "src/collection/utils.dart", "src/core/hash.dart", "src/core/optional.dart", + "src/core/utils.dart", "src/iterables/concat.dart", "src/iterables/count.dart", "src/iterables/cycle.dart", @@ -343,10 +342,8 @@ dart_library("quiver") { "strings.dart", "testing/async.dart", "testing/equality.dart", - "testing/runtime.dart", "testing/src/async/fake_async.dart", "testing/src/equality/equality.dart", - "testing/src/runtime/checked_mode.dart", "testing/src/time/time.dart", "testing/time.dart", "time.dart", diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart index a2eb297b79feb..18a02134c9159 100644 --- a/tools/licenses/lib/paths.dart +++ b/tools/licenses/lib/paths.dart @@ -141,6 +141,7 @@ final Set skippedPaths = { r'third_party/pkg/platform', r'third_party/pkg/process', r'third_party/pkg/process_runner', + r'third_party/pkg/quiver', r'third_party/pkg/vector_math', r'third_party/pyyaml', // build-time dependency only r'third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable