From c86ebbd86bcdd9e7b691489eb63ec82cde7dd641 Mon Sep 17 00:00:00 2001
From: Steven Roose <steven@stevenroose.org>
Date: Tue, 9 Oct 2018 17:48:05 +0100
Subject: [PATCH] Update to support Dart v2

---
 lib/src/decoder.dart |  2 ++
 lib/src/encoder.dart |  4 ++--
 pubspec.yaml         | 10 +++++-----
 test/codec_test.dart |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/src/decoder.dart b/lib/src/decoder.dart
index bab866a..b3d8281 100644
--- a/lib/src/decoder.dart
+++ b/lib/src/decoder.dart
@@ -66,4 +66,6 @@ class EventSourceDecoder implements StreamTransformer<List<int>, Event> {
     });
     return controller.stream;
   }
+
+  StreamTransformer<RS, RT> cast <RS, RT>() => StreamTransformer.castFrom<List<int>, Event, RS, RT>(this);
 }
diff --git a/lib/src/encoder.dart b/lib/src/encoder.dart
index f69bcb5..73259f9 100644
--- a/lib/src/encoder.dart
+++ b/lib/src/encoder.dart
@@ -20,7 +20,7 @@ class EventSourceEncoder extends Converter<Event, List<int>> {
   @override
   List<int> convert(Event event) {
     String payload = convertToString(event);
-    List<int> bytes = UTF8.encode(payload);
+    List<int> bytes = utf8.encode(payload);
     if (compressed) {
       bytes = GZIP.encode(bytes);
     }
@@ -48,7 +48,7 @@ class EventSourceEncoder extends Converter<Event, List<int>> {
     if (compressed) {
       inputSink = GZIP.encoder.startChunkedConversion(inputSink);
     }
-    inputSink = UTF8.encoder.startChunkedConversion(inputSink);
+    inputSink = utf8.encoder.startChunkedConversion(inputSink);
     return new ProxySink(
         onAdd: (Event event) => inputSink.add(convertToString(event)),
         onClose: () => inputSink.close());
diff --git a/pubspec.yaml b/pubspec.yaml
index 09adc43..9a2e07c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,18 +1,18 @@
 name: eventsource
 description: A client and server implementation of Server-Sent Events.
-version: 0.1.0+2
+version: 0.2.0
 author: Steven Roose <stevenroose@gmail.com>
 homepage: https://github.com/stevenroose/dart-eventsource
 
 environment:
-  sdk: ">=1.0.0 <2.0.0"
+  sdk: ">=1.0.0 <3.0.0"
 
 dependencies:
   collection: ">=1.4.1 <2.0.0"
-  http: ">=0.11.0 <0.12.0"
+  http: ">=0.11.0 <0.13.0"
   http_parser: ">=2.2.0 <4.0.0"
   logging: ">=0.11.0 <0.12.0"
-  sync: ">=0.1.0 <0.2.0"
+  sync: ">=0.1.0 <0.3.0"
 
 dev_dependencies:
-  test: ">=0.12.0 <0.13.0"
+  test: ">=0.12.0 <2.0.0"
diff --git a/test/codec_test.dart b/test/codec_test.dart
index d54cd66..70fc7db 100644
--- a/test/codec_test.dart
+++ b/test/codec_test.dart
@@ -22,7 +22,7 @@ void main() {
       var encoder = new EventSourceEncoder();
       for (Event event in _VECTORS.keys) {
         var encoded = _VECTORS[event];
-        expect(encoder.convert(event), equals(UTF8.encode(encoded)));
+        expect(encoder.convert(event), equals(utf8.encode(encoded)));
       }
     });
     //TODO add gzip test