Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 32c4685

Browse files
jason-simmonsjason-simmons
authored
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.
1 parent 2213b80 commit 32c4685

File tree

6 files changed

+8
-121
lines changed

6 files changed

+8
-121
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ deps = {
632632
Var('github_git') + '/google/process_runner.git' + '@' + 'd632ea0bfd814d779fcc53a361ed33eaf3620a0b', # 4.0.1
633633

634634
'src/third_party/pkg/quiver':
635-
Var('github_git') + '/google/quiver-dart.git' + '@' + '66f473cca1332496e34a783ba4527b04388fd561', # 2.1.5
635+
Var('github_git') + '/google/quiver-dart.git' + '@' + '90b92bee895e507d435012356a8b5c5f17eafa52', # 3.2.1
636636

637637
'src/third_party/pkg/vector_math':
638638
Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0

‎ci/licenses_golden/excluded_files‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2345,21 +2345,7 @@
23452345
../../../third_party/pkg/platform
23462346
../../../third_party/pkg/process
23472347
../../../third_party/pkg/process_runner
2348-
../../../third_party/pkg/quiver/.git
2349-
../../../third_party/pkg/quiver/.gitattributes
2350-
../../../third_party/pkg/quiver/.github
2351-
../../../third_party/pkg/quiver/.gitignore
2352-
../../../third_party/pkg/quiver/.travis.yml
2353-
../../../third_party/pkg/quiver/AUTHORS
2354-
../../../third_party/pkg/quiver/CHANGELOG.md
2355-
../../../third_party/pkg/quiver/CONTRIBUTING.md
2356-
../../../third_party/pkg/quiver/PATENTS
2357-
../../../third_party/pkg/quiver/README.md
2358-
../../../third_party/pkg/quiver/analysis_options.yaml
2359-
../../../third_party/pkg/quiver/dart_test.yaml
2360-
../../../third_party/pkg/quiver/lib/testing
2361-
../../../third_party/pkg/quiver/pubspec.yaml
2362-
../../../third_party/pkg/quiver/test
2348+
../../../third_party/pkg/quiver
23632349
../../../third_party/pkg/vector_math
23642350
../../../third_party/pyyaml
23652351
../../../third_party/rapidjson/.git

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 1 addition & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: af42eb900d317d9812456d1da10ffb70
1+
Signature: f1d6c82f3cba39cb558775d99f3b207b
22

33
====================================================================================================
44
LIBRARY: angle
@@ -278,7 +278,6 @@ LIBRARY: flatbuffers
278278
LIBRARY: fuchsia-vulkan
279279
LIBRARY: glslang
280280
LIBRARY: khronos
281-
LIBRARY: pkg
282281
LIBRARY: shaderc
283282
LIBRARY: spirv-cross
284283
LIBRARY: vulkan-headers
@@ -670,54 +669,6 @@ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_
670669
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/fuchsia-vulkan/include/vulkan/vk_sdk_platform.h
671670
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/khronos/GLES2/gl2platform.h
672671
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/khronos/GLES3/gl3platform.h
673-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/async.dart
674-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/cache.dart
675-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/check.dart
676-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/collection.dart
677-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/core.dart
678-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/io.dart
679-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/iterables.dart
680-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/mirrors.dart
681-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/pattern.dart
682-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/collect.dart
683-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/concat.dart
684-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/countdown_timer.dart
685-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/enumerate.dart
686-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/future_stream.dart
687-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/iteration.dart
688-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/metronome.dart
689-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/stream_buffer.dart
690-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/stream_router.dart
691-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/async/string.dart
692-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/cache/cache.dart
693-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/cache/map_cache.dart
694-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/bimap.dart
695-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/iterable.dart
696-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/list.dart
697-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/map.dart
698-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/queue.dart
699-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/delegates/set.dart
700-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/lru_map.dart
701-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/multimap.dart
702-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/collection/treeset.dart
703-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/core/hash.dart
704-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/core/optional.dart
705-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/concat.dart
706-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/count.dart
707-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/cycle.dart
708-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/enumerate.dart
709-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/generating_iterable.dart
710-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/infinite_iterable.dart
711-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/merge.dart
712-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/min_max.dart
713-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/partition.dart
714-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/range.dart
715-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/iterables/zip.dart
716-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/time/clock.dart
717-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/time/duration_unit_constants.dart
718-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/src/time/util.dart
719-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/strings.dart
720-
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/pkg/quiver/lib/time.dart
721672
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/shaderc/android_test/test.cpp
722673
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/shaderc/glslc/src/dependency_info.cc
723674
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
23642315
FILE: ../../../third_party/khronos/EGL/eglplatform.h
23652316
FILE: ../../../third_party/khronos/GLES2/gl2platform.h
23662317
FILE: ../../../third_party/khronos/GLES3/gl3platform.h
2367-
FILE: ../../../third_party/pkg/quiver/lib/async.dart
2368-
FILE: ../../../third_party/pkg/quiver/lib/cache.dart
2369-
FILE: ../../../third_party/pkg/quiver/lib/check.dart
2370-
FILE: ../../../third_party/pkg/quiver/lib/collection.dart
2371-
FILE: ../../../third_party/pkg/quiver/lib/core.dart
2372-
FILE: ../../../third_party/pkg/quiver/lib/io.dart
2373-
FILE: ../../../third_party/pkg/quiver/lib/iterables.dart
2374-
FILE: ../../../third_party/pkg/quiver/lib/mirrors.dart
2375-
FILE: ../../../third_party/pkg/quiver/lib/pattern.dart
2376-
FILE: ../../../third_party/pkg/quiver/lib/src/async/collect.dart
2377-
FILE: ../../../third_party/pkg/quiver/lib/src/async/concat.dart
2378-
FILE: ../../../third_party/pkg/quiver/lib/src/async/countdown_timer.dart
2379-
FILE: ../../../third_party/pkg/quiver/lib/src/async/enumerate.dart
2380-
FILE: ../../../third_party/pkg/quiver/lib/src/async/future_stream.dart
2381-
FILE: ../../../third_party/pkg/quiver/lib/src/async/iteration.dart
2382-
FILE: ../../../third_party/pkg/quiver/lib/src/async/metronome.dart
2383-
FILE: ../../../third_party/pkg/quiver/lib/src/async/stream_buffer.dart
2384-
FILE: ../../../third_party/pkg/quiver/lib/src/async/stream_router.dart
2385-
FILE: ../../../third_party/pkg/quiver/lib/src/async/string.dart
2386-
FILE: ../../../third_party/pkg/quiver/lib/src/cache/cache.dart
2387-
FILE: ../../../third_party/pkg/quiver/lib/src/cache/map_cache.dart
2388-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/bimap.dart
2389-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/iterable.dart
2390-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/list.dart
2391-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/map.dart
2392-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/queue.dart
2393-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/set.dart
2394-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/lru_map.dart
2395-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/multimap.dart
2396-
FILE: ../../../third_party/pkg/quiver/lib/src/collection/treeset.dart
2397-
FILE: ../../../third_party/pkg/quiver/lib/src/core/hash.dart
2398-
FILE: ../../../third_party/pkg/quiver/lib/src/core/optional.dart
2399-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/concat.dart
2400-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/count.dart
2401-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/cycle.dart
2402-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/enumerate.dart
2403-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/generating_iterable.dart
2404-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/infinite_iterable.dart
2405-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/merge.dart
2406-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/min_max.dart
2407-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/partition.dart
2408-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/range.dart
2409-
FILE: ../../../third_party/pkg/quiver/lib/src/iterables/zip.dart
2410-
FILE: ../../../third_party/pkg/quiver/lib/src/time/clock.dart
2411-
FILE: ../../../third_party/pkg/quiver/lib/src/time/duration_unit_constants.dart
2412-
FILE: ../../../third_party/pkg/quiver/lib/src/time/util.dart
2413-
FILE: ../../../third_party/pkg/quiver/lib/strings.dart
2414-
FILE: ../../../third_party/pkg/quiver/lib/time.dart
24152318
FILE: ../../../third_party/shaderc/DEVELOPMENT.howto.md
24162319
FILE: ../../../third_party/shaderc/android_test/test.cpp
24172320
FILE: ../../../third_party/shaderc/downloads.md

‎ci/licenses_golden/tool_signature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 00d569c39c5ea2c3160c0e500196dd7e
1+
Signature: 3178ef16b4b2174991a8ce7cee53c769
22

‎shell/platform/fuchsia/dart/BUILD.gn‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ dart_library("quiver") {
286286
package_name = "quiver"
287287

288288
# The current version of this library is not null safe
289-
language_version = "2.0"
289+
language_version = "2.17"
290290

291291
deps = [
292292
":matcher",
@@ -299,16 +299,13 @@ dart_library("quiver") {
299299
"check.dart",
300300
"collection.dart",
301301
"core.dart",
302-
"io.dart",
303302
"iterables.dart",
304-
"mirrors.dart",
305303
"pattern.dart",
306304
"src/async/collect.dart",
307305
"src/async/concat.dart",
308306
"src/async/countdown_timer.dart",
309307
"src/async/enumerate.dart",
310308
"src/async/future_stream.dart",
311-
"src/async/iteration.dart",
312309
"src/async/metronome.dart",
313310
"src/async/stream_buffer.dart",
314311
"src/async/stream_router.dart",
@@ -324,8 +321,10 @@ dart_library("quiver") {
324321
"src/collection/lru_map.dart",
325322
"src/collection/multimap.dart",
326323
"src/collection/treeset.dart",
324+
"src/collection/utils.dart",
327325
"src/core/hash.dart",
328326
"src/core/optional.dart",
327+
"src/core/utils.dart",
329328
"src/iterables/concat.dart",
330329
"src/iterables/count.dart",
331330
"src/iterables/cycle.dart",
@@ -343,10 +342,8 @@ dart_library("quiver") {
343342
"strings.dart",
344343
"testing/async.dart",
345344
"testing/equality.dart",
346-
"testing/runtime.dart",
347345
"testing/src/async/fake_async.dart",
348346
"testing/src/equality/equality.dart",
349-
"testing/src/runtime/checked_mode.dart",
350347
"testing/src/time/time.dart",
351348
"testing/time.dart",
352349
"time.dart",

‎tools/licenses/lib/paths.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ final Set<String> skippedPaths = <String>{
141141
r'third_party/pkg/platform',
142142
r'third_party/pkg/process',
143143
r'third_party/pkg/process_runner',
144+
r'third_party/pkg/quiver',
144145
r'third_party/pkg/vector_math',
145146
r'third_party/pyyaml', // build-time dependency only
146147
r'third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable

0 commit comments

Comments
 (0)