Merge branch 'master' into fix/async_cache_storing_exception

dart-archive · Jun 26, 2024 · 67b8250 · 67b8250
2 parents de2067d + d7c0cd5
commit 67b8250
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,3 +10,7 @@ updates:
     interval: monthly
   labels:
     - autosubmit
+  groups:
+    github-actions:
+      patterns:
+        - "*"
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -22,8 +22,8 @@ jobs:
       matrix:
         sdk: [dev]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
+      - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
           sdk: ${{ matrix.sdk }}
       - id: install
@@ -47,10 +47,10 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [3.2, dev]
+        sdk: [3.4, dev]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
+      - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
           sdk: ${{ matrix.sdk }}
       - id: install
@@ -62,5 +62,4 @@ jobs:
       - run: dart test --platform chrome --compiler dart2js
         if: always() && steps.install.outcome == 'success'
       - run: dart test --platform chrome --compiler dart2wasm
-        # TODO: drop `dev` filter when dart2wasm is working on stable
-        if: always() && steps.install.outcome == 'success' && matrix.sdk == 'dev'
+        if: always() && steps.install.outcome == 'success'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,6 @@
 ## 2.12.0-wip
-
-* Require Dart 3.2
 * Can decide `fetch` method of `AsyncCache` will store exception or not.
-
+* Require Dart 3.2
 
 ## 2.11.0
 

diff --git a/lib/async.dart b/lib/async.dart
@@ -6,7 +6,7 @@
 /// library.
 ///
 /// {@youtube 560 315 https://www.youtube.com/watch?v=r0tHiCjW2w0}
-library async;
+library;
 
 export 'src/async_cache.dart';
 export 'src/async_memoizer.dart';

diff --git a/lib/src/cancelable_operation.dart b/lib/src/cancelable_operation.dart
@@ -4,8 +4,6 @@
 
 import 'dart:async';
 
-import 'package:collection/collection.dart';
-
 /// An asynchronous operation that can be cancelled.
 ///
 /// The value of this operation is exposed as [value]. When this operation is
@@ -521,7 +519,7 @@ class CancelableCompleter<T> {
     final isFuture = toReturn is Future;
     final cancelFutures = <Future<Object?>>[
       if (isFuture) toReturn,
-      ...?_cancelForwarders?.map(_forward).whereNotNull()
+      ...?_cancelForwarders?.map(_forward).nonNulls
     ];
     final results = (isFuture && cancelFutures.length == 1)
         ? [await toReturn]

diff --git a/lib/src/stream_group.dart b/lib/src/stream_group.dart
@@ -4,8 +4,6 @@
 
 import 'dart:async';
 
-import 'package:collection/collection.dart';
-
 /// A collection of streams whose events are unified and sent through a central
 /// stream.
 ///
@@ -239,7 +237,7 @@ class StreamGroup<T> implements Sink<Stream<T>> {
             return null;
           }
         })
-        .whereNotNull()
+        .nonNulls
         .toList();
 
     _subscriptions.clear();

diff --git a/lib/src/stream_queue.dart b/lib/src/stream_queue.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:collection/collection.dart';
+import 'package:collection/collection.dart' show QueueList;
 
 import 'cancelable_operation.dart';
 import 'result/result.dart';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,14 +4,17 @@ description: Utility functions and classes related to the 'dart:async' library.
 repository: https://github.com/dart-lang/async
 
 environment:
-  sdk: ^3.2.0
+  sdk: ^3.4.0
 
 dependencies:
   collection: ^1.15.0
-  meta: ^1.1.7
+  meta: ^1.3.0
 
 dev_dependencies:
-  dart_flutter_team_lints: ^2.0.0
+  dart_flutter_team_lints: ^3.0.0
   fake_async: ^1.2.0
   stack_trace: ^1.10.0
-  test: ^1.16.0
+  test: ^1.16.6
+
+topics:
+- async
diff --git a/test/io_sink_impl.dart b/test/io_sink_impl.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @Deprecated('Tests deprecated functionality')
-library io_sink_impl;
+library;
 
 import 'dart:io';
 

diff --git a/test/sink_base_test.dart b/test/sink_base_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @Deprecated('Tests deprecated functionality')
-library sink_base_test;
+library;
 
 import 'dart:async';
 import 'dart:convert';