Skip to content

Commit

Permalink
Roll quiver to 3.2.1
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jason-simmons committed Jan 4, 2023
1 parent c0b3f8f commit 019e42b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 105 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
99 changes: 1 addition & 98 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: af42eb900d317d9812456d1da10ffb70
Signature: f1d6c82f3cba39cb558775d99f3b207b

====================================================================================================
LIBRARY: angle
Expand Down Expand Up @@ -278,7 +278,6 @@ LIBRARY: flatbuffers
LIBRARY: fuchsia-vulkan
LIBRARY: glslang
LIBRARY: khronos
LIBRARY: pkg
LIBRARY: shaderc
LIBRARY: spirv-cross
LIBRARY: vulkan-headers
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions shell/platform/fuchsia/dart/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ final Set<String> skippedPaths = <String>{
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
Expand Down

0 comments on commit 019e42b

Please sign in to comment.