Require Dart 3.3, update and fix lints

.github/workflows/test-package.yml

@@ -47,7 +47,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [2.19.0, dev]
+        sdk: [3.3, dev]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.3-wip
+
+* Require Dart 3.3
+
 ## 2.1.2
 
 * Require Dart 2.19

example/example.dart

@@ -22,7 +22,7 @@ Future<void> main() async {
   // For example, we can handle standard input as strings:
   var stringChannel = stdioChannel
       .transform(StreamChannelTransformer.fromCodec(utf8))
-      .transformStream(LineSplitter());
+      .transformStream(const LineSplitter());
   stringChannel.sink.add('world!\n');
 
   // You can implement StreamChannel<T> by extending StreamChannelMixin<T>, but
@@ -84,8 +84,8 @@ Future<void> main() async {
   // given the corresponding `SendPort`, and then call
   // `IsolateChannel.connectSend`.
   var recv = ReceivePort();
-  var recvChannel = IsolateChannel.connectReceive(recv);
-  var sendChannel = IsolateChannel.connectSend(recv.sendPort);
+  var recvChannel = IsolateChannel<void>.connectReceive(recv);
+  var sendChannel = IsolateChannel<void>.connectSend(recv.sendPort);
 
   // You must manually close `IsolateChannel<T>` sinks, however.
   await recvChannel.sink.close();

lib/src/disconnector.dart

@@ -38,7 +38,7 @@ class Disconnector<T> implements StreamChannelTransformer<T, T> {
         _sinks.clear();
         return Future.wait(futures, eagerError: true);
       });
-  final _disconnectMemo = AsyncMemoizer();
+  final _disconnectMemo = AsyncMemoizer<List<void>>();
 
   @override
   StreamChannel<T> bind(StreamChannel<T> channel) {

lib/src/guarantee_channel.dart

@@ -83,7 +83,7 @@ class _GuaranteeSink<T> implements StreamSink<T> {
 
   @override
   Future<void> get done => _doneCompleter.future;
-  final _doneCompleter = Completer();
+  final _doneCompleter = Completer<void>();
 
   /// Whether connection is disconnected.
   ///

lib/src/isolate_channel.dart

@@ -51,7 +51,7 @@ class IsolateChannel<T> extends StreamChannelMixin<T> {
         .transform(StreamSinkTransformer.fromHandlers(handleDone: (sink) {
       if (!isCompleted) {
         receivePort.close();
-        streamCompleter.setSourceStream(Stream.empty());
+        streamCompleter.setSourceStream(const Stream.empty());
         sinkCompleter.setDestinationSink(NullStreamSink<T>());
       }
       sink.close();

lib/src/multi_channel.dart

@@ -191,7 +191,8 @@ class _MultiChannel<T> extends StreamChannelMixin<T>
     // If the inner channel has already closed, create new virtual channels in a
     // closed state.
     if (_inner == null) {
-      return VirtualChannel._(this, inputId, Stream.empty(), NullStreamSink());
+      return VirtualChannel._(
+          this, inputId, const Stream.empty(), NullStreamSink());
     }
 
     late StreamChannelController<T> controller;

lib/src/stream_channel_completer.dart

@@ -34,7 +34,7 @@ class StreamChannelCompleter<T> {
   /// instead contain just that error. The sink will silently discard all
   /// events.
   static StreamChannel fromFuture(Future<StreamChannel> channelFuture) {
-    var completer = StreamChannelCompleter();
+    var completer = StreamChannelCompleter<void>();
     channelFuture.then(completer.setChannel, onError: completer.setError);
     return completer.channel;
   }

pubspec.yaml

@@ -1,16 +1,16 @@
 name: stream_channel
-version: 2.1.2
+version: 2.1.3-wip
 description: >-
   An abstraction for two-way communication channels based on the Dart Stream
   class.
 repository: https://github.com/dart-lang/stream_channel
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.3.0
 
 dependencies:
   async: ^2.5.0
 
 dev_dependencies:
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
   test: ^1.16.0

test/disconnector_test.dart

@@ -14,8 +14,8 @@ void main() {
   late Disconnector disconnector;
   late StreamChannel channel;
   setUp(() {
-    streamController = StreamController();
-    sinkController = StreamController();
+    streamController = StreamController<void>();
+    sinkController = StreamController<void>();
     disconnector = Disconnector();
     channel = StreamChannel.withGuarantees(
             streamController.stream, sinkController.sink)
@@ -52,7 +52,7 @@ void main() {
     });
 
     test("events can't be added while a stream is being added", () {
-      var controller = StreamController();
+      var controller = StreamController<void>();
       channel.sink.addStream(controller.stream);
 
       expect(() => channel.sink.add(1), throwsStateError);
@@ -67,7 +67,7 @@ void main() {
 
   test('cancels addStream when disconnected', () async {
     var canceled = false;
-    var controller = StreamController(onCancel: () {
+    var controller = StreamController<void>(onCancel: () {
       canceled = true;
     });
     expect(channel.sink.addStream(controller.stream), completes);
@@ -78,9 +78,9 @@ void main() {
   });
 
   test('disconnect() returns the close future from the inner sink', () async {
-    var streamController = StreamController();
-    var sinkController = StreamController();
-    var disconnector = Disconnector();
+    var streamController = StreamController<void>();
+    var sinkController = StreamController<void>();
+    var disconnector = Disconnector<void>();
     var sink = _CloseCompleterSink(sinkController.sink);
     StreamChannel.withGuarantees(streamController.stream, sink)
         .transform(disconnector);
@@ -140,7 +140,7 @@ void main() {
 /// returned by [close] using [completer].
 class _CloseCompleterSink extends DelegatingStreamSink {
   /// The completer for the future returned by [close].
-  final completer = Completer();
+  final completer = Completer<void>();
 
   _CloseCompleterSink(super.inner);
 

test/isolate_channel_test.dart

@@ -53,7 +53,7 @@ void main() {
   });
 
   test("events can't be added while a stream is being added", () {
-    var controller = StreamController();
+    var controller = StreamController<void>();
     channel.sink.addStream(controller.stream);
 
     expect(() => channel.sink.add(1), throwsStateError);
@@ -109,7 +109,7 @@ void main() {
     test('the sink closes as soon as an error is added via addStream',
         () async {
       var canceled = false;
-      var controller = StreamController(onCancel: () {
+      var controller = StreamController<void>(onCancel: () {
         canceled = true;
       });
 
@@ -156,7 +156,7 @@ void main() {
 
     test('the receiving channel produces an error if it gets the wrong message',
         () {
-      var connectedChannel = IsolateChannel.connectReceive(connectPort);
+      var connectedChannel = IsolateChannel<int>.connectReceive(connectPort);
       connectPort.sendPort.send('wrong value');
 
       expect(connectedChannel.stream.toList(), throwsStateError);
@@ -165,7 +165,7 @@ void main() {
 
     test('the receiving channel closes gracefully without a connection',
         () async {
-      var connectedChannel = IsolateChannel.connectReceive(connectPort);
+      var connectedChannel = IsolateChannel<int>.connectReceive(connectPort);
       await connectedChannel.sink.close();
       await expectLater(connectedChannel.stream.toList(), completion(isEmpty));
       await expectLater(connectedChannel.sink.done, completes);

test/json_document_transformer_test.dart

@@ -41,6 +41,6 @@ void main() {
   test('synchronously throws if an unencodable object is added', () {
     var transformed = channel.transform(jsonDocument);
     expect(() => transformed.sink.add(Object()),
-        throwsA(TypeMatcher<JsonUnsupportedObjectError>()));
+        throwsA(const TypeMatcher<JsonUnsupportedObjectError>()));
   });
 }

test/stream_channel_completer_test.dart

@@ -14,8 +14,8 @@ void main() {
   late StreamChannel innerChannel;
   setUp(() {
     completer = StreamChannelCompleter();
-    streamController = StreamController();
-    sinkController = StreamController();
+    streamController = StreamController<void>();
+    sinkController = StreamController<void>();
     innerChannel = StreamChannel(streamController.stream, sinkController.sink);
   });
 

test/stream_channel_test.dart

@@ -10,21 +10,17 @@ import 'package:stream_channel/stream_channel.dart';
 import 'package:test/test.dart';
 
 void main() {
-  late StreamController streamController;
-  late StreamController sinkController;
-  late StreamChannel channel;
-  setUp(() {
-    streamController = StreamController();
-    sinkController = StreamController();
-    channel = StreamChannel(streamController.stream, sinkController.sink);
-  });
-
   test("pipe() pipes data from each channel's stream into the other's sink",
       () {
-    var otherStreamController = StreamController();
-    var otherSinkController = StreamController();
+    var otherStreamController = StreamController<int>();
+    var otherSinkController = StreamController<int>();
     var otherChannel =
         StreamChannel(otherStreamController.stream, otherSinkController.sink);
+
+    var streamController = StreamController<int>();
+    var sinkController = StreamController<int>();
+    var channel = StreamChannel(streamController.stream, sinkController.sink);
+
     channel.pipe(otherChannel);
 
     streamController.add(1);
@@ -41,6 +37,10 @@ void main() {
   });
 
   test('transform() transforms the channel', () async {
+    var streamController = StreamController<List<int>>();
+    var sinkController = StreamController<List<int>>();
+    var channel = StreamChannel(streamController.stream, sinkController.sink);
+
     var transformed = channel
         .cast<List<int>>()
         .transform(StreamChannelTransformer.fromCodec(utf8));
@@ -59,6 +59,10 @@ void main() {
   });
 
   test('transformStream() transforms only the stream', () async {
+    var streamController = StreamController<String>();
+    var sinkController = StreamController<String>();
+    var channel = StreamChannel(streamController.stream, sinkController.sink);
+
     var transformed =
         channel.cast<String>().transformStream(const LineSplitter());
 
@@ -75,8 +79,12 @@ void main() {
   });
 
   test('transformSink() transforms only the sink', () async {
+    var streamController = StreamController<String>();
+    var sinkController = StreamController<String>();
+    var channel = StreamChannel(streamController.stream, sinkController.sink);
+
     var transformed = channel.cast<String>().transformSink(
-        StreamSinkTransformer.fromStreamTransformer(const LineSplitter()));
+        const StreamSinkTransformer.fromStreamTransformer(LineSplitter()));
 
     streamController.add('fbl\nthp');
     unawaited(streamController.close());
@@ -91,7 +99,11 @@ void main() {
   });
 
   test('changeStream() changes the stream', () {
-    var newController = StreamController();
+    var streamController = StreamController<int>();
+    var sinkController = StreamController<int>();
+    var channel = StreamChannel(streamController.stream, sinkController.sink);
+
+    var newController = StreamController<int>();
     var changed = channel.changeStream((stream) {
       expect(stream, equals(channel.stream));
       return newController.stream;
@@ -107,7 +119,11 @@ void main() {
   });
 
   test('changeSink() changes the sink', () {
-    var newController = StreamController();
+    var streamController = StreamController<int>();
+    var sinkController = StreamController<int>();
+    var channel = StreamChannel(streamController.stream, sinkController.sink);
+
+    var newController = StreamController<int>();
     var changed = channel.changeSink((sink) {
       expect(sink, equals(channel.sink));
       return newController.sink;

test/with_close_guarantee_test.dart

@@ -45,7 +45,7 @@ void main() {
             .listen(expectAsync1((event) {
               if (event == 2) channel.sink.close();
             }, count: 2))
-            .asFuture(),
+            .asFuture<void>(),
         completes);
 
     await pumpEventQueue();

test/with_guarantees_test.dart

@@ -12,8 +12,8 @@ void main() {
   late StreamController sinkController;
   late StreamChannel channel;
   setUp(() {
-    streamController = StreamController();
-    sinkController = StreamController();
+    streamController = StreamController<void>();
+    sinkController = StreamController<void>();
     channel = StreamChannel.withGuarantees(
         streamController.stream, sinkController.sink);
   });
@@ -53,7 +53,7 @@ void main() {
             .listen(expectAsync1((event) {
               if (event == 2) channel.sink.close();
             }, count: 2))
-            .asFuture(),
+            .asFuture<void>(),
         completes);
   });
 
@@ -126,7 +126,7 @@ void main() {
   });
 
   test("events can't be added while a stream is being added", () {
-    var controller = StreamController();
+    var controller = StreamController<void>();
     channel.sink.addStream(controller.stream);
 
     expect(() => channel.sink.add(1), throwsStateError);
@@ -140,8 +140,8 @@ void main() {
 
   group('with allowSinkErrors: false', () {
     setUp(() {
-      streamController = StreamController();
-      sinkController = StreamController();
+      streamController = StreamController<void>();
+      sinkController = StreamController<void>();
       channel = StreamChannel.withGuarantees(
           streamController.stream, sinkController.sink,
           allowSinkErrors: false);
@@ -166,7 +166,7 @@ void main() {
               .listen(expectAsync1((event) {
                 if (event == 2) channel.sink.addError('oh no');
               }, count: 2))
-              .asFuture(),
+              .asFuture<void>(),
           completes);
     });
 
@@ -180,7 +180,7 @@ void main() {
         'adding an error via via addStream causes the stream to emit a done '
         'event', () async {
       var canceled = false;
-      var controller = StreamController(onCancel: () {
+      var controller = StreamController<void>(onCancel: () {
         canceled = true;
       });