Skip to content

Commit c6ca220

Browse files
authored
Reduce Dart SDK requirement from >=2.1.0-dev to >=2.1.0-dev (#547)
This is to support current Flutter stable.
1 parent dbae992 commit c6ca220

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

packages/devtools/lib/src/ui/ui_utils.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,11 @@ Set<String> get hiddenPages {
263263
Set<String> _lookupHiddenPages() {
264264
final queryString = html.window.location.search;
265265
if (queryString == null || queryString.length <= 1) {
266-
return {};
266+
// TODO(dantup): Remove this ignore, change to `{}` and bump SDK requirements
267+
// in pubspec.yaml (devtools + devtools_server) once Flutter stable includes
268+
// Dart SDK >= v2.2.
269+
// ignore: prefer_collection_literals
270+
return Set();
267271
}
268272
final qsParams = Uri.splitQueryString(queryString.substring(1));
269273
return (qsParams['hide'] ?? '').split(',').toSet();

packages/devtools/lib/src/vm_service_wrapper.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ class VmServiceWrapper implements VmService {
2727
final bool trackFutures;
2828
final Map<String, Future<Success>> _activeStreams = {};
2929

30-
final Set<TrackedFuture<Object>> activeFutures = {};
30+
// TODO(dantup): Remove this ignore, change to `{}` and bump SDK requirements
31+
// in pubspec.yaml (devtools + devtools_server) once Flutter stable includes
32+
// Dart SDK >= v2.2.
33+
// ignore: prefer_collection_literals
34+
final Set<TrackedFuture<Object>> activeFutures = Set();
3135
Completer<bool> _allFuturesCompleter = Completer<bool>()
3236
// Mark the future as completed by default so if we don't track any
3337
// futures but someone tries to wait on [allFuturesCompleted] they don't

packages/devtools/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ author: Dart Team <misc@dartlang.org>
99
homepage: https://github.com/flutter/devtools
1010

1111
environment:
12-
sdk: '>=2.2.0-dev <3.0.0'
12+
sdk: '>=2.1.0-dev <3.0.0'
1313

1414
dependencies:
1515
codemirror: ^0.5.3

packages/devtools_server/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: Dart Team <misc@dartlang.org>
77
homepage: https://github.com/flutter/devtools
88

99
environment:
10-
sdk: '>=2.2.0-dev <3.0.0'
10+
sdk: '>=2.1.0-dev <3.0.0'
1111

1212
dependencies:
1313
args: ^1.5.1

0 commit comments

Comments
 (0)