diff --git a/web/_tool/verify_packages.dart b/web/_tool/verify_packages.dart index f09f763eb..d52b50761 100644 --- a/web/_tool/verify_packages.dart +++ b/web/_tool/verify_packages.dart @@ -21,7 +21,12 @@ void main() async { for (var i = 0; i < packageDirs.length; i++) { final dir = packageDirs[i]; _logWrapped(_ansiMagenta, '\n$dir (${i + 1} of ${packageDirs.length})'); - results.add(await _run(dir, 'pub', ['upgrade', '--no-precompile'])); + results.add(await _run(dir, 'flutter', [ + 'pub', + 'pub', + 'upgrade', + '--no-precompile', + ])); results.add(await _run( dir, 'dartanalyzer', diff --git a/web/charts/lib/axes/line_disjoint_axis.dart b/web/charts/lib/axes/line_disjoint_axis.dart index 9b77ae73d..7809a1afd 100644 --- a/web/charts/lib/axes/line_disjoint_axis.dart +++ b/web/charts/lib/axes/line_disjoint_axis.dart @@ -23,7 +23,7 @@ // EXCLUDE_FROM_GALLERY_DOCS_START import 'dart:collection' show LinkedHashMap; import 'dart:math'; -// EXCLUDE_FROM_GALLERY_DOCS_END + import 'package:charts_flutter/flutter.dart' as charts; import 'package:flutter/material.dart'; @@ -136,6 +136,7 @@ class DisjointMeasureAxisLineChart extends StatelessWidget { ..setAttribute(charts.measureAxisIdKey, 'axis 4'), ]; } + // EXCLUDE_FROM_GALLERY_DOCS_END @override @@ -264,5 +265,5 @@ class LinearClicks { final int clickCount; final double clickRate; - LinearClicks(this.year, {this.clickCount = null, this.clickRate = null}); + LinearClicks(this.year, {this.clickCount, this.clickRate}); } diff --git a/web/charts/lib/behaviors/selection_callback_example.dart b/web/charts/lib/behaviors/selection_callback_example.dart index 79e33e7fc..ba4bde9b3 100644 --- a/web/charts/lib/behaviors/selection_callback_example.dart +++ b/web/charts/lib/behaviors/selection_callback_example.dart @@ -59,14 +59,14 @@ class SelectionCallbackExample extends StatefulWidget { static List> _createRandomData() { final random = new Random(); - final us_data = [ + final usData = [ new TimeSeriesSales(new DateTime(2017, 9, 19), random.nextInt(100)), new TimeSeriesSales(new DateTime(2017, 9, 26), random.nextInt(100)), new TimeSeriesSales(new DateTime(2017, 10, 3), random.nextInt(100)), new TimeSeriesSales(new DateTime(2017, 10, 10), random.nextInt(100)), ]; - final uk_data = [ + final ukData = [ new TimeSeriesSales(new DateTime(2017, 9, 19), random.nextInt(100)), new TimeSeriesSales(new DateTime(2017, 9, 26), random.nextInt(100)), new TimeSeriesSales(new DateTime(2017, 10, 3), random.nextInt(100)), @@ -78,13 +78,13 @@ class SelectionCallbackExample extends StatefulWidget { id: 'US Sales', domainFn: (TimeSeriesSales sales, _) => sales.time, measureFn: (TimeSeriesSales sales, _) => sales.sales, - data: us_data, + data: usData, ), new charts.Series( id: 'UK Sales', domainFn: (TimeSeriesSales sales, _) => sales.time, measureFn: (TimeSeriesSales sales, _) => sales.sales, - data: uk_data, + data: ukData, ) ]; } @@ -97,14 +97,14 @@ class SelectionCallbackExample extends StatefulWidget { /// Create one series with sample hard coded data. static List> _createSampleData() { - final us_data = [ + final usData = [ new TimeSeriesSales(new DateTime(2017, 9, 19), 5), new TimeSeriesSales(new DateTime(2017, 9, 26), 25), new TimeSeriesSales(new DateTime(2017, 10, 3), 78), new TimeSeriesSales(new DateTime(2017, 10, 10), 54), ]; - final uk_data = [ + final ukData = [ new TimeSeriesSales(new DateTime(2017, 9, 19), 15), new TimeSeriesSales(new DateTime(2017, 9, 26), 33), new TimeSeriesSales(new DateTime(2017, 10, 3), 68), @@ -116,13 +116,13 @@ class SelectionCallbackExample extends StatefulWidget { id: 'US Sales', domainFn: (TimeSeriesSales sales, _) => sales.time, measureFn: (TimeSeriesSales sales, _) => sales.sales, - data: us_data, + data: usData, ), new charts.Series( id: 'UK Sales', domainFn: (TimeSeriesSales sales, _) => sales.time, measureFn: (TimeSeriesSales sales, _) => sales.sales, - data: uk_data, + data: ukData, ) ]; } @@ -185,7 +185,7 @@ class _SelectionCallbackState extends State { child: new Text(_time.toString()))); } _measures?.forEach((String series, num value) { - children.add(new Text('${series}: ${value}')); + children.add(new Text('$series: $value')); }); return new Column(children: children); diff --git a/web/charts/lib/behaviors/slider.dart b/web/charts/lib/behaviors/slider.dart index 5c57180e3..a08b3fe00 100644 --- a/web/charts/lib/behaviors/slider.dart +++ b/web/charts/lib/behaviors/slider.dart @@ -169,7 +169,7 @@ class _SliderCallbackState extends State { if (_sliderDomainValue != null) { children.add(new Padding( padding: new EdgeInsets.only(top: 5.0), - child: new Text('Slider domain value: ${_sliderDomainValue}'))); + child: new Text('Slider domain value: $_sliderDomainValue'))); } if (_sliderPosition != null) { children.add(new Padding( @@ -180,7 +180,7 @@ class _SliderCallbackState extends State { if (_sliderDragState != null) { children.add(new Padding( padding: new EdgeInsets.only(top: 5.0), - child: new Text('Slider drag state: ${_sliderDragState}'))); + child: new Text('Slider drag state: $_sliderDragState'))); } return new Column(children: children); diff --git a/web/github_dataviz/lib/layered_chart.dart b/web/github_dataviz/lib/layered_chart.dart index 8075563d6..c39f8bb12 100644 --- a/web/github_dataviz/lib/layered_chart.dart +++ b/web/github_dataviz/lib/layered_chart.dart @@ -30,7 +30,7 @@ class LayeredChartState extends State { double graphHeight; List labelPainter; List milestonePainter; - Size lastSize = null; + Size lastSize; void buildPaths( Size size, diff --git a/web/github_dataviz/lib/timeline.dart b/web/github_dataviz/lib/timeline.dart index 9582cf542..482588ac9 100644 --- a/web/github_dataviz/lib/timeline.dart +++ b/web/github_dataviz/lib/timeline.dart @@ -39,7 +39,7 @@ class TimelineState extends State { void initState() { super.initState(); for (int year = 2015; year < 2020; year++) { - String yearLabel = "${year}"; + String yearLabel = "$year"; labelPainters[yearLabel] = _makeTextPainter(Constants.timelineLineColor, yearLabel); } @@ -174,7 +174,7 @@ class TimelinePainter extends CustomPainter { } if (isYear) { - var yearLabel = "${yearNumber}"; + var yearLabel = "$yearNumber"; state.labelPainters[yearLabel] .paint(canvas, Offset(currX, size.height - labelHeight)); yearNumber++; diff --git a/web/slide_puzzle/pubspec.lock b/web/slide_puzzle/pubspec.lock index 45e194161..dfd4d9ffd 100644 --- a/web/slide_puzzle/pubspec.lock +++ b/web/slide_puzzle/pubspec.lock @@ -7,7 +7,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.36.0" + version: "0.36.4" archive: dependency: transitive description: @@ -64,6 +64,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.2" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.16.1" flutter: dependency: "direct main" description: flutter @@ -80,7 +87,7 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.15" + version: "0.1.19" glob: dependency: transitive description: @@ -88,6 +95,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.7" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.14.0+2" http: dependency: transitive description: @@ -101,7 +115,7 @@ packages: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.1.0" http_parser: dependency: transitive description: @@ -136,14 +150,14 @@ packages: name: json_rpc_2 url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.1.0" kernel: dependency: transitive description: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.15" + version: "0.3.19" matcher: dependency: transitive description: @@ -164,7 +178,7 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "0.9.6+2" + version: "0.9.6+3" multi_server_socket: dependency: transitive description: @@ -178,14 +192,14 @@ packages: name: node_preamble url: "https://pub.dartlang.org" source: hosted - version: "1.4.4" + version: "1.4.8" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0" package_resolver: dependency: transitive description: @@ -262,7 +276,7 @@ packages: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.2+5" + version: "0.2.3" sky_engine: dependency: transitive description: flutter @@ -358,21 +372,21 @@ packages: name: vm_service_client url: "https://pub.dartlang.org" source: hosted - version: "0.2.6+1" + version: "0.2.6+3" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+10" + version: "0.9.7+12" web_socket_channel: dependency: transitive description: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.0.12" + version: "1.0.15" xml: dependency: transitive description: @@ -386,6 +400,6 @@ packages: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.1.15" + version: "2.1.16" sdks: dart: ">=2.4.0 <3.0.0" diff --git a/web/timeflow/lib/numberpicker.dart b/web/timeflow/lib/numberpicker.dart index fa4cff6b8..dbef35011 100644 --- a/web/timeflow/lib/numberpicker.dart +++ b/web/timeflow/lib/numberpicker.dart @@ -399,7 +399,7 @@ class NumberPicker extends StatelessWidget { Notification notification, ScrollController scrollController) { return notification is UserScrollNotification && notification.direction == ScrollDirection.idle && - // ignore: invalid_use_of_protected_member + // ignore: invalid_use_of_protected_member,invalid_use_of_visible_for_testing_member scrollController.position.activity is! HoldScrollActivity; }