Merge pull request flutter#18 from dart-lang/json-document-transforme…

…r-bind

Fix JsonDocumentTransformer.bind for dart 2

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.5
+
+* Fix an issue with `JsonDocumentTransformer.bind` where it created an internal
+  stream channel which didn't get a properly inferred type for its `sink`.
+
 ## 1.6.4
 
 * Fix a race condition in `MultiChannel` where messages from a remote virtual

lib/src/json_document_transformer.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:async/async.dart';
@@ -35,9 +36,10 @@ class JsonDocumentTransformer
 
   JsonDocumentTransformer._(this._codec);
 
-  StreamChannel bind(StreamChannel<String> channel) {
+  StreamChannel<Object> bind(StreamChannel<String> channel) {
     var stream = channel.stream.map(_codec.decode);
-    var sink = new StreamSinkTransformer.fromHandlers(handleData: (data, sink) {
+    var sink = new StreamSinkTransformer<Object, String>.fromHandlers(
+        handleData: (data, sink) {
       sink.add(_codec.encode(data));
     }).bind(channel.sink);
     return new StreamChannel.withCloseGuarantee(stream, sink);

pubspec.yaml

@@ -1,5 +1,5 @@
 name: stream_channel
-version: 1.6.4
+version: 1.6.5
 description: An abstraction for two-way communication channels.
 author: Dart Team <[email protected]>
 homepage: https://github.com/dart-lang/stream_channel