diff --git a/bin/internal/dart-sdk.version b/bin/internal/dart-sdk.version index 832c65b55dd..fdc33b04657 100644 --- a/bin/internal/dart-sdk.version +++ b/bin/internal/dart-sdk.version @@ -1 +1 @@ -1.22.0-dev.9.1 +1.22.0-dev.10.3 diff --git a/examples/stocks/lib/stock_data.dart b/examples/stocks/lib/stock_data.dart index 3c89472c117..8700a150eb0 100644 --- a/examples/stocks/lib/stock_data.dart +++ b/examples/stocks/lib/stock_data.dart @@ -76,7 +76,7 @@ class StockDataFetcher { String json = response.body; if (json == null) { print("Failed to load stock data chunk ${_nextChunk - 1}"); - return; + return null; } JsonDecoder decoder = new JsonDecoder(); callback(new StockData(decoder.convert(json))); diff --git a/packages/flutter/lib/src/material/drop_down.dart b/packages/flutter/lib/src/material/drop_down.dart index f4413f858db..1d6116d2285 100644 --- a/packages/flutter/lib/src/material/drop_down.dart +++ b/packages/flutter/lib/src/material/drop_down.dart @@ -517,7 +517,7 @@ class _DropdownButtonState extends State> { style: _textStyle, )).then((_DropdownRouteResult newValue) { if (!mounted || newValue == null) - return; + return null; if (config.onChanged != null) config.onChanged(newValue.result); }); diff --git a/packages/flutter/lib/src/material/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart index 77578c15070..3e1475fd811 100644 --- a/packages/flutter/lib/src/material/popup_menu.dart +++ b/packages/flutter/lib/src/material/popup_menu.dart @@ -537,7 +537,7 @@ class _PopupMenuButtonState extends State> { ) .then((T newValue) { if (!mounted || newValue == null) - return; + return null; if (config.onSelected != null) config.onSelected(newValue); }); diff --git a/packages/flutter/lib/src/widgets/pageable_list.dart b/packages/flutter/lib/src/widgets/pageable_list.dart index fdc492fae9e..9b7825ed9d9 100644 --- a/packages/flutter/lib/src/widgets/pageable_list.dart +++ b/packages/flutter/lib/src/widgets/pageable_list.dart @@ -317,14 +317,14 @@ abstract class PageableState extends ScrollableState { final double newScrollOffset = snapScrollOffset(scrollOffset + scrollVelocity.sign) .clamp(snapScrollOffset(scrollOffset - 0.5), snapScrollOffset(scrollOffset + 0.5)); return scrollTo(newScrollOffset, duration: config.duration, curve: config.curve) - .then(_notifyPageChanged); + .then(_notifyPageChanged); } @override Future fling(double scrollVelocity) { switch(config.itemsSnapAlignment) { case PageableListFlingBehavior.canFlingAcrossMultiplePages: - return super.fling(scrollVelocity).then(_notifyPageChanged); + return (super.fling(scrollVelocity)).then(_notifyPageChanged); case PageableListFlingBehavior.stopAtNextPage: return _flingToAdjacentItem(scrollVelocity); } @@ -335,7 +335,7 @@ abstract class PageableState extends ScrollableState { @override Future settleScrollOffset() { return scrollTo(snapScrollOffset(scrollOffset), duration: config.duration, curve: config.curve) - .then(_notifyPageChanged); + .then(_notifyPageChanged); } void _notifyPageChanged(Null value) { diff --git a/packages/flutter_test/lib/src/controller.dart b/packages/flutter_test/lib/src/controller.dart index 85cdc41bb5a..2f487743699 100644 --- a/packages/flutter_test/lib/src/controller.dart +++ b/packages/flutter_test/lib/src/controller.dart @@ -143,7 +143,7 @@ class WidgetController { /// /// * Use [firstState] if you expect to match several states but only want the first. /// * Use [stateList] if you expect to match several states and want all of them. - T state(Finder finder) { + T state>(Finder finder) { // TODO(leafp): remove '' when https://github.com/dart-lang/sdk/issues/28580 is fixed TestAsyncUtils.guardSync(); return _stateOf(finder.evaluate().single, finder); } @@ -155,7 +155,7 @@ class WidgetController { /// matching widget has no state. /// /// * Use [state] if you only expect to match one state. - T firstState(Finder finder) { + T firstState>(Finder finder) { // TODO(leafp): remove '' when https://github.com/dart-lang/sdk/issues/28580 is fixed TestAsyncUtils.guardSync(); return _stateOf(finder.evaluate().first, finder); } @@ -167,12 +167,12 @@ class WidgetController { /// /// * Use [state] if you only expect to match one state. /// * Use [firstState] if you expect to match several but only want the first. - Iterable stateList(Finder finder) { + Iterable stateList>(Finder finder) { // TODO(leafp): remove '' when https://github.com/dart-lang/sdk/issues/28580 is fixed TestAsyncUtils.guardSync(); return finder.evaluate().map((Element element) => _stateOf(element, finder)); } - T _stateOf(Element element, Finder finder) { + T _stateOf>(Element element, Finder finder) { // TODO(leafp): remove '' when https://github.com/dart-lang/sdk/issues/28580 is fixed TestAsyncUtils.guardSync(); if (element is StatefulElement) return element.state; diff --git a/packages/flutter_test/lib/src/test_async_utils.dart b/packages/flutter_test/lib/src/test_async_utils.dart index b3dd2fd0801..ffdf22f0980 100644 --- a/packages/flutter_test/lib/src/test_async_utils.dart +++ b/packages/flutter_test/lib/src/test_async_utils.dart @@ -102,8 +102,10 @@ class TestAsyncUtils { throw new FlutterError(message.toString().trimRight()); } } - return result.then( - (Null value) => completionHandler(null, null), + return result.then( + (Null value) { + completionHandler(null, null); + }, onError: completionHandler ); } diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 61e14042a53..24901c3f323 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -464,7 +464,7 @@ class AppDomain extends Domain { if (app == null) throw "app '$appId' not found"; - return app.stop().timeout(new Duration(seconds: 5)).then((_) { + return app.stop().timeout(new Duration(seconds: 5)).then((_) { return true; }).catchError((dynamic error) { _sendAppEvent(app, 'log', { 'log': '$error', 'error': true }); diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index f145a5ade1a..e6cf2d606b7 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -278,7 +278,7 @@ class IOSDevice extends Device { Future launch = runCommandAndStreamOutput(launchCommand, trace: true); - List uris = await launch.then((int result) async { + List uris = await launch.then>((int result) async { installationResult = result; if (result != 0) {