Skip to content

Commit 7a63156

Browse files
kevmoojohnpryan
kevmoo
authored and
johnpryan
committed
Fix web/_tool/verify_packages
Fix lints in a number of samples
1 parent f9d973e commit 7a63156

File tree

8 files changed

+51
-31
lines changed

8 files changed

+51
-31
lines changed

‎web/_tool/verify_packages.dart

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ void main() async {
2121
for (var i = 0; i < packageDirs.length; i++) {
2222
final dir = packageDirs[i];
2323
_logWrapped(_ansiMagenta, '\n$dir (${i + 1} of ${packageDirs.length})');
24-
results.add(await _run(dir, 'pub', ['upgrade', '--no-precompile']));
24+
results.add(await _run(dir, 'flutter', [
25+
'pub',
26+
'pub',
27+
'upgrade',
28+
'--no-precompile',
29+
]));
2530
results.add(await _run(
2631
dir,
2732
'dartanalyzer',

‎web/charts/lib/axes/line_disjoint_axis.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// EXCLUDE_FROM_GALLERY_DOCS_START
2424
import 'dart:collection' show LinkedHashMap;
2525
import 'dart:math';
26-
// EXCLUDE_FROM_GALLERY_DOCS_END
26+
2727
import 'package:charts_flutter/flutter.dart' as charts;
2828
import 'package:flutter/material.dart';
2929

@@ -136,6 +136,7 @@ class DisjointMeasureAxisLineChart extends StatelessWidget {
136136
..setAttribute(charts.measureAxisIdKey, 'axis 4'),
137137
];
138138
}
139+
139140
// EXCLUDE_FROM_GALLERY_DOCS_END
140141

141142
@override
@@ -264,5 +265,5 @@ class LinearClicks {
264265
final int clickCount;
265266
final double clickRate;
266267

267-
LinearClicks(this.year, {this.clickCount = null, this.clickRate = null});
268+
LinearClicks(this.year, {this.clickCount, this.clickRate});
268269
}

‎web/charts/lib/behaviors/selection_callback_example.dart

+9-9
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ class SelectionCallbackExample extends StatefulWidget {
5959
static List<charts.Series<TimeSeriesSales, DateTime>> _createRandomData() {
6060
final random = new Random();
6161

62-
final us_data = [
62+
final usData = [
6363
new TimeSeriesSales(new DateTime(2017, 9, 19), random.nextInt(100)),
6464
new TimeSeriesSales(new DateTime(2017, 9, 26), random.nextInt(100)),
6565
new TimeSeriesSales(new DateTime(2017, 10, 3), random.nextInt(100)),
6666
new TimeSeriesSales(new DateTime(2017, 10, 10), random.nextInt(100)),
6767
];
6868

69-
final uk_data = [
69+
final ukData = [
7070
new TimeSeriesSales(new DateTime(2017, 9, 19), random.nextInt(100)),
7171
new TimeSeriesSales(new DateTime(2017, 9, 26), random.nextInt(100)),
7272
new TimeSeriesSales(new DateTime(2017, 10, 3), random.nextInt(100)),
@@ -78,13 +78,13 @@ class SelectionCallbackExample extends StatefulWidget {
7878
id: 'US Sales',
7979
domainFn: (TimeSeriesSales sales, _) => sales.time,
8080
measureFn: (TimeSeriesSales sales, _) => sales.sales,
81-
data: us_data,
81+
data: usData,
8282
),
8383
new charts.Series<TimeSeriesSales, DateTime>(
8484
id: 'UK Sales',
8585
domainFn: (TimeSeriesSales sales, _) => sales.time,
8686
measureFn: (TimeSeriesSales sales, _) => sales.sales,
87-
data: uk_data,
87+
data: ukData,
8888
)
8989
];
9090
}
@@ -97,14 +97,14 @@ class SelectionCallbackExample extends StatefulWidget {
9797

9898
/// Create one series with sample hard coded data.
9999
static List<charts.Series<TimeSeriesSales, DateTime>> _createSampleData() {
100-
final us_data = [
100+
final usData = [
101101
new TimeSeriesSales(new DateTime(2017, 9, 19), 5),
102102
new TimeSeriesSales(new DateTime(2017, 9, 26), 25),
103103
new TimeSeriesSales(new DateTime(2017, 10, 3), 78),
104104
new TimeSeriesSales(new DateTime(2017, 10, 10), 54),
105105
];
106106

107-
final uk_data = [
107+
final ukData = [
108108
new TimeSeriesSales(new DateTime(2017, 9, 19), 15),
109109
new TimeSeriesSales(new DateTime(2017, 9, 26), 33),
110110
new TimeSeriesSales(new DateTime(2017, 10, 3), 68),
@@ -116,13 +116,13 @@ class SelectionCallbackExample extends StatefulWidget {
116116
id: 'US Sales',
117117
domainFn: (TimeSeriesSales sales, _) => sales.time,
118118
measureFn: (TimeSeriesSales sales, _) => sales.sales,
119-
data: us_data,
119+
data: usData,
120120
),
121121
new charts.Series<TimeSeriesSales, DateTime>(
122122
id: 'UK Sales',
123123
domainFn: (TimeSeriesSales sales, _) => sales.time,
124124
measureFn: (TimeSeriesSales sales, _) => sales.sales,
125-
data: uk_data,
125+
data: ukData,
126126
)
127127
];
128128
}
@@ -185,7 +185,7 @@ class _SelectionCallbackState extends State<SelectionCallbackExample> {
185185
child: new Text(_time.toString())));
186186
}
187187
_measures?.forEach((String series, num value) {
188-
children.add(new Text('${series}: ${value}'));
188+
children.add(new Text('$series: $value'));
189189
});
190190

191191
return new Column(children: children);

‎web/charts/lib/behaviors/slider.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class _SliderCallbackState extends State<SliderLine> {
169169
if (_sliderDomainValue != null) {
170170
children.add(new Padding(
171171
padding: new EdgeInsets.only(top: 5.0),
172-
child: new Text('Slider domain value: ${_sliderDomainValue}')));
172+
child: new Text('Slider domain value: $_sliderDomainValue')));
173173
}
174174
if (_sliderPosition != null) {
175175
children.add(new Padding(
@@ -180,7 +180,7 @@ class _SliderCallbackState extends State<SliderLine> {
180180
if (_sliderDragState != null) {
181181
children.add(new Padding(
182182
padding: new EdgeInsets.only(top: 5.0),
183-
child: new Text('Slider drag state: ${_sliderDragState}')));
183+
child: new Text('Slider drag state: $_sliderDragState')));
184184
}
185185

186186
return new Column(children: children);

‎web/github_dataviz/lib/layered_chart.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class LayeredChartState extends State<LayeredChart> {
3030
double graphHeight;
3131
List<TextPainter> labelPainter;
3232
List<TextPainter> milestonePainter;
33-
Size lastSize = null;
33+
Size lastSize;
3434

3535
void buildPaths(
3636
Size size,

‎web/github_dataviz/lib/timeline.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class TimelineState extends State<Timeline> {
3939
void initState() {
4040
super.initState();
4141
for (int year = 2015; year < 2020; year++) {
42-
String yearLabel = "${year}";
42+
String yearLabel = "$year";
4343
labelPainters[yearLabel] =
4444
_makeTextPainter(Constants.timelineLineColor, yearLabel);
4545
}
@@ -174,7 +174,7 @@ class TimelinePainter extends CustomPainter {
174174
}
175175

176176
if (isYear) {
177-
var yearLabel = "${yearNumber}";
177+
var yearLabel = "$yearNumber";
178178
state.labelPainters[yearLabel]
179179
.paint(canvas, Offset(currX, size.height - labelHeight));
180180
yearNumber++;

‎web/slide_puzzle/pubspec.lock

+27-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: analyzer
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "0.36.0"
10+
version: "0.36.4"
1111
archive:
1212
dependency: transitive
1313
description:
@@ -64,6 +64,13 @@ packages:
6464
url: "https://pub.dartlang.org"
6565
source: hosted
6666
version: "2.1.2"
67+
csslib:
68+
dependency: transitive
69+
description:
70+
name: csslib
71+
url: "https://pub.dartlang.org"
72+
source: hosted
73+
version: "0.16.1"
6774
flutter:
6875
dependency: "direct main"
6976
description: flutter
@@ -80,14 +87,21 @@ packages:
8087
name: front_end
8188
url: "https://pub.dartlang.org"
8289
source: hosted
83-
version: "0.1.15"
90+
version: "0.1.19"
8491
glob:
8592
dependency: transitive
8693
description:
8794
name: glob
8895
url: "https://pub.dartlang.org"
8996
source: hosted
9097
version: "1.1.7"
98+
html:
99+
dependency: transitive
100+
description:
101+
name: html
102+
url: "https://pub.dartlang.org"
103+
source: hosted
104+
version: "0.14.0+2"
91105
http:
92106
dependency: transitive
93107
description:
@@ -101,7 +115,7 @@ packages:
101115
name: http_multi_server
102116
url: "https://pub.dartlang.org"
103117
source: hosted
104-
version: "2.0.5"
118+
version: "2.1.0"
105119
http_parser:
106120
dependency: transitive
107121
description:
@@ -136,14 +150,14 @@ packages:
136150
name: json_rpc_2
137151
url: "https://pub.dartlang.org"
138152
source: hosted
139-
version: "2.0.10"
153+
version: "2.1.0"
140154
kernel:
141155
dependency: transitive
142156
description:
143157
name: kernel
144158
url: "https://pub.dartlang.org"
145159
source: hosted
146-
version: "0.3.15"
160+
version: "0.3.19"
147161
matcher:
148162
dependency: transitive
149163
description:
@@ -164,7 +178,7 @@ packages:
164178
name: mime
165179
url: "https://pub.dartlang.org"
166180
source: hosted
167-
version: "0.9.6+2"
181+
version: "0.9.6+3"
168182
multi_server_socket:
169183
dependency: transitive
170184
description:
@@ -178,14 +192,14 @@ packages:
178192
name: node_preamble
179193
url: "https://pub.dartlang.org"
180194
source: hosted
181-
version: "1.4.4"
195+
version: "1.4.8"
182196
package_config:
183197
dependency: transitive
184198
description:
185199
name: package_config
186200
url: "https://pub.dartlang.org"
187201
source: hosted
188-
version: "1.0.5"
202+
version: "1.1.0"
189203
package_resolver:
190204
dependency: transitive
191205
description:
@@ -262,7 +276,7 @@ packages:
262276
name: shelf_web_socket
263277
url: "https://pub.dartlang.org"
264278
source: hosted
265-
version: "0.2.2+5"
279+
version: "0.2.3"
266280
sky_engine:
267281
dependency: transitive
268282
description: flutter
@@ -358,21 +372,21 @@ packages:
358372
name: vm_service_client
359373
url: "https://pub.dartlang.org"
360374
source: hosted
361-
version: "0.2.6+1"
375+
version: "0.2.6+3"
362376
watcher:
363377
dependency: transitive
364378
description:
365379
name: watcher
366380
url: "https://pub.dartlang.org"
367381
source: hosted
368-
version: "0.9.7+10"
382+
version: "0.9.7+12"
369383
web_socket_channel:
370384
dependency: transitive
371385
description:
372386
name: web_socket_channel
373387
url: "https://pub.dartlang.org"
374388
source: hosted
375-
version: "1.0.12"
389+
version: "1.0.15"
376390
xml:
377391
dependency: transitive
378392
description:
@@ -386,6 +400,6 @@ packages:
386400
name: yaml
387401
url: "https://pub.dartlang.org"
388402
source: hosted
389-
version: "2.1.15"
403+
version: "2.1.16"
390404
sdks:
391405
dart: ">=2.4.0 <3.0.0"

‎web/timeflow/lib/numberpicker.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ class NumberPicker extends StatelessWidget {
399399
Notification notification, ScrollController scrollController) {
400400
return notification is UserScrollNotification &&
401401
notification.direction == ScrollDirection.idle &&
402-
// ignore: invalid_use_of_protected_member
402+
// ignore: invalid_use_of_protected_member,invalid_use_of_visible_for_testing_member
403403
scrollController.position.activity is! HoldScrollActivity;
404404
}
405405

0 commit comments

Comments
 (0)