Commit d2fda677 authored by Phil Quitslund's avatar Phil Quitslund Committed by GitHub

Update to Dart `1.20.0-dev.1.0`. (#5689)

* Udpate to Dart `1.20.0-dev.1.0`.

Udpate to Dart `1.20.0-dev.1.0` and corresponding `analyzer` package.

* Added `--no-packages-dir`.

* Revert extension to master.

* Added ignores.

* Review nits.

* More nits.
parent 99a9bbbe
......@@ -189,7 +189,7 @@ class _PointDemoState extends State<_PointDemo> {
return new RawGestureDetector(
behavior: _dragTarget == null ? HitTestBehavior.deferToChild : HitTestBehavior.opaque,
gestures: <Type, GestureRecognizerFactory>{
ImmediateMultiDragGestureRecognizer: (ImmediateMultiDragGestureRecognizer recognizer) {
ImmediateMultiDragGestureRecognizer: (ImmediateMultiDragGestureRecognizer recognizer) { // ignore: map_value_type_not_assignable, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new ImmediateMultiDragGestureRecognizer())
..onStart = _handleOnStart;
}
......@@ -359,7 +359,7 @@ class _RectangleDemoState extends State<_RectangleDemo> {
return new RawGestureDetector(
behavior: _dragTarget == null ? HitTestBehavior.deferToChild : HitTestBehavior.opaque,
gestures: <Type, GestureRecognizerFactory>{
ImmediateMultiDragGestureRecognizer: (ImmediateMultiDragGestureRecognizer recognizer) {
ImmediateMultiDragGestureRecognizer: (ImmediateMultiDragGestureRecognizer recognizer) { // ignore: map_value_type_not_assignable, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new ImmediateMultiDragGestureRecognizer())
..onStart = _handleOnStart;
}
......
......@@ -185,7 +185,7 @@ class _ExpansionPanelsDemoState extends State<ExpasionPanelsDemo> {
value: 'Caribbean cruise',
hint: 'Change trip name',
valueToString: (String value) => value,
builder: (DemoItem<String> item) {
builder: (DemoItem<String> item) { // ignore: argument_type_not_assignable, https://github.com/flutter/flutter/issues/5771
void close() {
setState(() {
item.isExpanded = false;
......@@ -216,7 +216,7 @@ class _ExpansionPanelsDemoState extends State<ExpasionPanelsDemo> {
value: _Location.Bahamas,
hint: 'Select location',
valueToString: (_Location location) => location.toString().split(".")[1],
builder: (DemoItem<_Location> item) {
builder: (DemoItem<_Location> item) { // ignore: argument_type_not_assignable, https://github.com/flutter/flutter/issues/5771
void close() {
setState(() {
item.isExpanded = false;
......@@ -278,7 +278,7 @@ class _ExpansionPanelsDemoState extends State<ExpasionPanelsDemo> {
value: 80.0,
hint: 'Select amount of sun',
valueToString: (double amount) => '${amount.round()}',
builder: (DemoItem<double> item) {
builder: (DemoItem<double> item) { // ignore: argument_type_not_assignable, https://github.com/flutter/flutter/issues/5771
void close() {
setState(() {
item.isExpanded = false;
......
......@@ -143,7 +143,7 @@ class LeaveBehindDemoState extends State<LeaveBehindDemo> {
value: LeaveBehindDemoAction.reset,
child: new Text('Reset the list')
),
new PopupMenuDivider(),
new PopupMenuDivider(), // ignore: list_element_type_not_assignable, https://github.com/flutter/flutter/issues/5771
new CheckedPopupMenuItem<LeaveBehindDemoAction>(
value: LeaveBehindDemoAction.horizontalSwipe,
checked: _dismissDirection == DismissDirection.horizontal,
......
......@@ -140,7 +140,7 @@ class MenuDemoState extends State<MenuDemo> {
title: new Text('Get link')
)
),
new PopupMenuDivider(),
new PopupMenuDivider(), // ignore: list_element_type_not_assignable, https://github.com/flutter/flutter/issues/5771
new PopupMenuItem<String>(
value: 'Remove',
child: new ListItem(
......
name: flutter_gallery
dependencies:
intl: '>=0.12.4+2 <0.13.0'
intl: '>=0.12.4+2 <0.14.0'
collection: '>=1.4.0 <2.0.0'
string_scanner: ^1.0.0
......
......@@ -2,7 +2,7 @@ name: stocks
dependencies:
flutter:
path: ../../packages/flutter
intl: '>=0.12.4+2 <0.13.0'
intl: '>=0.12.4+2 <0.14.0'
dev_dependencies:
flutter_test:
......
......@@ -144,7 +144,7 @@ class AssetImage extends AssetBundleImageProvider {
// TODO(ianh): JSON decoding really shouldn't be on the main thread.
final Map<dynamic, dynamic> parsedManifest = JSON.decode(json);
// TODO(ianh): convert that data structure to the right types.
return new SynchronousFuture<Map<dynamic, dynamic>>(parsedManifest);
return new SynchronousFuture<Map<dynamic, dynamic>>(parsedManifest); // ignore: return_of_invalid_type, https://github.com/flutter/flutter/issues/5771
}
String _chooseVariant(String main, ImageConfiguration config, List<String> candidates) {
......
......@@ -223,7 +223,7 @@ class GestureDetector extends StatelessWidget {
Map<Type, GestureRecognizerFactory> gestures = <Type, GestureRecognizerFactory>{};
if (onTapDown != null || onTapUp != null || onTap != null || onTapCancel != null) {
gestures[TapGestureRecognizer] = (TapGestureRecognizer recognizer) {
gestures[TapGestureRecognizer] = (TapGestureRecognizer recognizer) { // ignore: invalid_assignment, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new TapGestureRecognizer())
..onTapDown = onTapDown
..onTapUp = onTapUp
......@@ -233,14 +233,14 @@ class GestureDetector extends StatelessWidget {
}
if (onDoubleTap != null) {
gestures[DoubleTapGestureRecognizer] = (DoubleTapGestureRecognizer recognizer) {
gestures[DoubleTapGestureRecognizer] = (DoubleTapGestureRecognizer recognizer) { // ignore: invalid_assignment, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new DoubleTapGestureRecognizer())
..onDoubleTap = onDoubleTap;
};
}
if (onLongPress != null) {
gestures[LongPressGestureRecognizer] = (LongPressGestureRecognizer recognizer) {
gestures[LongPressGestureRecognizer] = (LongPressGestureRecognizer recognizer) { // ignore: invalid_assignment, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new LongPressGestureRecognizer())
..onLongPress = onLongPress;
};
......@@ -251,7 +251,7 @@ class GestureDetector extends StatelessWidget {
onVerticalDragUpdate != null ||
onVerticalDragEnd != null ||
onVerticalDragCancel != null) {
gestures[VerticalDragGestureRecognizer] = (VerticalDragGestureRecognizer recognizer) {
gestures[VerticalDragGestureRecognizer] = (VerticalDragGestureRecognizer recognizer) { // ignore: invalid_assignment, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new VerticalDragGestureRecognizer())
..onDown = onVerticalDragDown
..onStart = onVerticalDragStart
......@@ -266,7 +266,7 @@ class GestureDetector extends StatelessWidget {
onHorizontalDragUpdate != null ||
onHorizontalDragEnd != null ||
onHorizontalDragCancel != null) {
gestures[HorizontalDragGestureRecognizer] = (HorizontalDragGestureRecognizer recognizer) {
gestures[HorizontalDragGestureRecognizer] = (HorizontalDragGestureRecognizer recognizer) { // ignore: invalid_assignment, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new HorizontalDragGestureRecognizer())
..onDown = onHorizontalDragDown
..onStart = onHorizontalDragStart
......@@ -281,7 +281,7 @@ class GestureDetector extends StatelessWidget {
onPanUpdate != null ||
onPanEnd != null ||
onPanCancel != null) {
gestures[PanGestureRecognizer] = (PanGestureRecognizer recognizer) {
gestures[PanGestureRecognizer] = (PanGestureRecognizer recognizer) { // ignore: invalid_assignment, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new PanGestureRecognizer())
..onDown = onPanDown
..onStart = onPanStart
......@@ -292,7 +292,7 @@ class GestureDetector extends StatelessWidget {
}
if (onScaleStart != null || onScaleUpdate != null || onScaleEnd != null) {
gestures[ScaleGestureRecognizer] = (ScaleGestureRecognizer recognizer) {
gestures[ScaleGestureRecognizer] = (ScaleGestureRecognizer recognizer) { // ignore: invalid_assignment, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new ScaleGestureRecognizer())
..onStart = onScaleStart
..onUpdate = onScaleUpdate
......
......@@ -695,7 +695,7 @@ class ScrollableState<T extends Scrollable> extends State<T> {
switch (config.scrollDirection) {
case Axis.vertical:
return <Type, GestureRecognizerFactory>{
VerticalDragGestureRecognizer: (VerticalDragGestureRecognizer recognizer) {
VerticalDragGestureRecognizer: (VerticalDragGestureRecognizer recognizer) { // ignore: map_value_type_not_assignable, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new VerticalDragGestureRecognizer())
..onDown = _handleDragDown
..onStart = _handleDragStart
......@@ -705,7 +705,7 @@ class ScrollableState<T extends Scrollable> extends State<T> {
};
case Axis.horizontal:
return <Type, GestureRecognizerFactory>{
HorizontalDragGestureRecognizer: (HorizontalDragGestureRecognizer recognizer) {
HorizontalDragGestureRecognizer: (HorizontalDragGestureRecognizer recognizer) { // ignore: map_value_type_not_assignable, https://github.com/flutter/flutter/issues/5771
return (recognizer ??= new HorizontalDragGestureRecognizer())
..onDown = _handleDragDown
..onStart = _handleDragStart
......
......@@ -26,6 +26,6 @@ abstract class UniqueWidget<T extends State> extends StatefulWidget {
/// Might be null if the widget is not currently in the tree.
T get currentState {
GlobalKey globalKey = key;
return globalKey.currentState;
return globalKey.currentState; // ignore: return_of_invalid_type, https://github.com/flutter/flutter/issues/5771
}
}
......@@ -6,12 +6,12 @@ homepage: http://flutter.io
dependencies:
collection: '>=1.4.0 <2.0.0'
intl: '>=0.12.4+2 <0.13.0'
intl: '>=0.12.4+2 <0.14.0'
vector_math: '>=2.0.3 <3.0.0'
crypto: '>=1.1.1 <3.0.0'
meta: ^0.12.0
meta: ^1.0.2
sky_engine:
path: ../../bin/cache/pkg/sky_engine
......
......@@ -367,8 +367,8 @@ Future<VMServiceClientConnection> _waitAndConnect(String url) async {
ws1 = await WebSocket.connect(uri.toString());
ws2 = await WebSocket.connect(uri.toString());
return new VMServiceClientConnection(
new VMServiceClient(new IOWebSocketChannel(ws1)),
new rpc.Peer(new IOWebSocketChannel(ws2))..listen()
new VMServiceClient(new IOWebSocketChannel(ws1).cast()),
new rpc.Peer(new IOWebSocketChannel(ws2).cast())..listen()
);
} catch(e) {
if (ws1 != null)
......
......@@ -60,14 +60,14 @@ class FlutterDriverExtension {
FlutterDriverExtension() {
_commandHandlers.addAll(<String, CommandHandlerCallback>{
'get_health': getHealth,
'tap': tap,
'get_text': getText,
'scroll': scroll,
'scrollIntoView': scrollIntoView,
'setInputText': _setInputText,
'submitInputText': _submitInputText,
'waitFor': waitFor,
'get_health': getHealth, // ignore: map_value_type_not_assignable, #5771
'tap': tap, // ignore: map_value_type_not_assignable, #5771
'get_text': getText, // ignore: map_value_type_not_assignable, #5771
'scroll': scroll, // ignore: map_value_type_not_assignable, #5771
'scrollIntoView': scrollIntoView, // ignore: map_value_type_not_assignable, #5771
'setInputText': _setInputText, // ignore: map_value_type_not_assignable, #5771
'submitInputText': _submitInputText, // ignore: map_value_type_not_assignable, #5771
'waitFor': waitFor, // ignore: map_value_type_not_assignable, #5771
});
_commandDeserializers.addAll(<String, CommandDeserializerCallback>{
......
......@@ -20,6 +20,6 @@ dependencies:
path: '../flutter_test'
dev_dependencies:
test: 0.12.15+1
mockito: '^0.11.0'
quiver: '^0.21.4'
test: 0.12.15+4
mockito: ^1.0.0
quiver: ^0.21.4
......@@ -5,12 +5,12 @@ dependencies:
# The flutter tools depend on very specific internal implementation
# details of the 'test' package, which change between versions, so
# here we pin it precisely to avoid version skew across our packages.
test: 0.12.15+1
test: 0.12.15+4
# We don't actually depend on 'analyzer', but 'test' and 'flutter_tools' do.
# We pin the version of analyzer we depend on to avoid version skew across our
# packages.
analyzer: 0.27.5-alpha.0
analyzer: 0.28.2-alpha.0
flutter:
path: ../flutter
......@@ -15,7 +15,6 @@ import 'package:analyzer/src/dart/sdk/sdk.dart'; // ignore: implementation_impor
import 'package:analyzer/src/generated/engine.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/error.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/java_io.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/sdk_io.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/source.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/source_io.dart'; // ignore: implementation_imports
import 'package:analyzer/src/task/options.dart'; // ignore: implementation_imports
......@@ -111,7 +110,8 @@ class AnalysisDriver {
resolvers.add(new DartUriResolver(sdk));
} else {
// Fall back to a standard SDK if no embedder is found.
DirectoryBasedDartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir));
FolderBasedDartSdk sdk = new FolderBasedDartSdk(PhysicalResourceProvider.INSTANCE,
PhysicalResourceProvider.INSTANCE.getFolder(sdkDir));
sdk.analysisOptions = context.analysisOptions;
resolvers.add(new DartUriResolver(sdk));
......
......@@ -48,7 +48,7 @@ Future<int> pubGet({
String command = upgrade ? 'upgrade' : 'get';
Status status = logger.startProgress("Running 'pub $command' in ${path.basename(directory)}...");
int code = await runCommandAndStreamOutput(
<String>[sdkBinaryName('pub'), '--verbosity=warning', command, '--no-package-symlinks', '--no-precompile'],
<String>[sdkBinaryName('pub'), '--verbosity=warning', command, '--no-packages-dir', '--no-precompile'],
workingDirectory: directory
);
status.stop(showElapsedTime: true);
......
......@@ -25,7 +25,7 @@ class VMService {
static Future<VMService> connect(int port) async {
Uri uri = new Uri(scheme: 'ws', host: '127.0.0.1', port: port, path: 'ws');
WebSocket ws = await WebSocket.connect(uri.toString());
rpc.Peer peer = new rpc.Peer(new IOWebSocketChannel(ws));
rpc.Peer peer = new rpc.Peer(new IOWebSocketChannel(ws).cast());
peer.listen();
Uri httpAddress = new Uri(scheme: 'http', host: '127.0.0.1', port: port);
return new VMService._(peer, port, httpAddress);
......
......@@ -22,7 +22,7 @@ dependencies:
json_schema: 1.0.3
linter: ^0.1.21
meta: ^0.12.0
meta: ^1.0.0
mustache4dart: ^1.0.0
package_config: '>=0.1.5 <2.0.0'
path: ^1.3.0
......@@ -36,13 +36,13 @@ dependencies:
# We depend on very specific internal implementation details of the
# 'test' package, which change between versions, so here we pin it
# precisely.
test: 0.12.15+1
test: 0.12.15+4
# Pinned in flutter_test as well.
analyzer: 0.27.5-alpha.0
analyzer: 0.28.2-alpha.0
dev_dependencies:
mockito: ^0.11.0
mockito: ^1.0.0
# Exclude this package from the hosted API docs.
dartdoc:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment