Skip to content

Commit fb2f18e

Browse files
authored
Prepare for Uint8List SDK breaking changes (flutter#34295)
dart-lang/sdk#36900
1 parent bdd0724 commit fb2f18e

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

dev/devicelab/lib/tasks/save_catalog_screenshots.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class Upload {
6565
} else {
6666
// TODO(hansmuller): only retry on 5xx and 429 responses
6767
logMessage('Request to save "$name" (length ${content.length}) failed with status ${response.statusCode}, will retry');
68-
logMessage(await response.transform<String>(utf8.decoder).join());
68+
logMessage(await response.cast<List<int>>().transform<String>(utf8.decoder).join());
6969
}
7070
return response.statusCode == HttpStatus.ok;
7171
} on TimeoutException catch (_) {

dev/tools/localization/localizations_utils.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Future<void> precacheLanguageAndRegionTags() async {
299299
final HttpClient client = HttpClient();
300300
final HttpClientRequest request = await client.getUrl(Uri.parse(registry));
301301
final HttpClientResponse response = await request.close();
302-
final String body = (await response.transform<String>(utf8.decoder).toList()).join('');
302+
final String body = (await response.cast<List<int>>().transform<String>(utf8.decoder).toList()).join('');
303303
client.close(force: true);
304304
final List<Map<String, List<String>>> sections = body.split('%%').skip(1).map<Map<String, List<String>>>(_parseSection).toList();
305305
for (Map<String, List<String>> section in sections) {

packages/flutter_tools/test/base/net_test.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// found in the LICENSE file.
44

55
import 'dart:async';
6+
import 'dart:typed_data';
67

78
import 'package:flutter_tools/src/base/io.dart' as io;
89
import 'package:flutter_tools/src/base/net.dart';
@@ -216,13 +217,13 @@ class MockHttpClientResponse extends Stream<List<int>> implements io.HttpClientR
216217
String get reasonPhrase => '<reason phrase>';
217218

218219
@override
219-
StreamSubscription<List<int>> listen(
220-
void onData(List<int> event), {
220+
StreamSubscription<Uint8List> listen(
221+
void onData(Uint8List event), {
221222
Function onError,
222223
void onDone(),
223224
bool cancelOnError,
224225
}) {
225-
return Stream<List<int>>.fromFuture(Future<List<int>>.error(const io.SocketException('test')))
226+
return Stream<Uint8List>.fromFuture(Future<Uint8List>.error(const io.SocketException('test')))
226227
.listen(onData, onError: onError, onDone: onDone, cancelOnError: cancelOnError);
227228
}
228229

packages/flutter_tools/test/commands/create_test.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import 'dart:async';
66
import 'dart:convert';
7+
import 'dart:typed_data';
78

89
import 'package:args/command_runner.dart';
910
import 'package:flutter_tools/src/base/file_system.dart';
@@ -1303,13 +1304,13 @@ class MockHttpClientResponse extends Stream<List<int>> implements HttpClientResp
13031304
*/
13041305

13051306
@override
1306-
StreamSubscription<List<int>> listen(
1307-
void onData(List<int> event), {
1307+
StreamSubscription<Uint8List> listen(
1308+
void onData(Uint8List event), {
13081309
Function onError,
13091310
void onDone(),
13101311
bool cancelOnError,
13111312
}) {
1312-
return Stream<List<int>>.fromIterable(<List<int>>[result.codeUnits])
1313+
return Stream<Uint8List>.fromIterable(<Uint8List>[Uint8List.fromList(result.codeUnits)])
13131314
.listen(onData, onError: onError, onDone: onDone, cancelOnError: cancelOnError);
13141315
}
13151316

0 commit comments

Comments
 (0)