Skip to content

Commit fc5b709

Browse files
authored
lints (hoc081098#35)
* lints * lints * lints
1 parent 9ef522b commit fc5b709

9 files changed

+69
-48
lines changed

analysis_options.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:pedantic/analysis_options.1.11.0.yaml
1+
include: package:flutter_lints/flutter.yaml
22
analyzer:
33
exclude:
44
# Ignore generated files
@@ -9,4 +9,9 @@ linter:
99
rules:
1010
- public_member_api_docs
1111
- prefer_final_locals
12-
- prefer_relative_imports
12+
- prefer_relative_imports
13+
# https://github.com/dart-lang/lints#migrating-from-packagepedantic
14+
- always_declare_return_types
15+
- prefer_single_quotes
16+
- unawaited_futures
17+
- unsafe_html

example/pubspec.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.5.0"
10+
version: "2.8.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
@@ -28,7 +28,7 @@ packages:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.2.0"
31+
version: "1.3.1"
3232
clock:
3333
dependency: transitive
3434
description:
@@ -120,7 +120,7 @@ packages:
120120
name: meta
121121
url: "https://pub.dartlang.org"
122122
source: hosted
123-
version: "1.3.0"
123+
version: "1.7.0"
124124
path:
125125
dependency: transitive
126126
description:
@@ -183,35 +183,35 @@ packages:
183183
path: ".."
184184
relative: true
185185
source: path
186-
version: "2.1.0"
186+
version: "2.2.0"
187187
rx_storage:
188188
dependency: transitive
189189
description:
190190
name: rx_storage
191191
url: "https://pub.dartlang.org"
192192
source: hosted
193-
version: "1.1.0"
193+
version: "1.2.0"
194194
rxdart:
195195
dependency: transitive
196196
description:
197197
name: rxdart
198198
url: "https://pub.dartlang.org"
199199
source: hosted
200-
version: "0.27.0"
200+
version: "0.27.2"
201201
rxdart_ext:
202202
dependency: transitive
203203
description:
204204
name: rxdart_ext
205205
url: "https://pub.dartlang.org"
206206
source: hosted
207-
version: "0.1.0"
207+
version: "0.1.2"
208208
shared_preferences:
209209
dependency: transitive
210210
description:
211211
name: shared_preferences
212212
url: "https://pub.dartlang.org"
213213
source: hosted
214-
version: "2.0.5"
214+
version: "2.0.7"
215215
shared_preferences_linux:
216216
dependency: transitive
217217
description:
@@ -258,7 +258,7 @@ packages:
258258
name: source_span
259259
url: "https://pub.dartlang.org"
260260
source: hosted
261-
version: "1.8.0"
261+
version: "1.8.1"
262262
stack_trace:
263263
dependency: transitive
264264
description:
@@ -293,7 +293,7 @@ packages:
293293
name: test_api
294294
url: "https://pub.dartlang.org"
295295
source: hosted
296-
version: "0.2.19"
296+
version: "0.4.2"
297297
typed_data:
298298
dependency: transitive
299299
description:
@@ -324,4 +324,4 @@ packages:
324324
version: "0.2.0"
325325
sdks:
326326
dart: ">=2.12.0 <3.0.0"
327-
flutter: ">=1.20.0"
327+
flutter: ">=2.0.0"

lib/src/config/global_config.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'package:flutter/foundation.dart';
2+
13
import '../logger/default_logger.dart';
24
import '../logger/logger.dart';
35

@@ -7,5 +9,5 @@ class RxSharedPreferencesConfigs {
79
/// Default value is a [RxSharedPreferencesDefaultLogger].
810
/// Can be set to `null` to disable logging.
911
static RxSharedPreferencesLogger? logger =
10-
const RxSharedPreferencesDefaultLogger();
12+
kReleaseMode ? null : const RxSharedPreferencesDefaultLogger();
1113
}

lib/src/logger/default_logger.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: avoid_print
2+
13
import 'package:rx_storage/rx_storage.dart';
24

35
import '../../rx_shared_preferences.dart';

pubspec.lock

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.5.0"
10+
version: "2.8.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
@@ -28,7 +28,7 @@ packages:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.2.0"
31+
version: "1.3.1"
3232
clock:
3333
dependency: transitive
3434
description:
@@ -76,6 +76,13 @@ packages:
7676
description: flutter
7777
source: sdk
7878
version: "0.0.0"
79+
flutter_lints:
80+
dependency: "direct dev"
81+
description:
82+
name: flutter_lints
83+
url: "https://pub.dartlang.org"
84+
source: hosted
85+
version: "1.0.4"
7986
flutter_test:
8087
dependency: "direct dev"
8188
description: flutter
@@ -93,6 +100,13 @@ packages:
93100
url: "https://pub.dartlang.org"
94101
source: hosted
95102
version: "0.6.3"
103+
lints:
104+
dependency: transitive
105+
description:
106+
name: lints
107+
url: "https://pub.dartlang.org"
108+
source: hosted
109+
version: "1.0.1"
96110
matcher:
97111
dependency: transitive
98112
description:
@@ -106,7 +120,7 @@ packages:
106120
name: meta
107121
url: "https://pub.dartlang.org"
108122
source: hosted
109-
version: "1.3.0"
123+
version: "1.7.0"
110124
path:
111125
dependency: transitive
112126
description:
@@ -135,13 +149,6 @@ packages:
135149
url: "https://pub.dartlang.org"
136150
source: hosted
137151
version: "2.0.0"
138-
pedantic:
139-
dependency: "direct dev"
140-
description:
141-
name: pedantic
142-
url: "https://pub.dartlang.org"
143-
source: hosted
144-
version: "1.11.0"
145152
platform:
146153
dependency: transitive
147154
description:
@@ -169,28 +176,28 @@ packages:
169176
name: rx_storage
170177
url: "https://pub.dartlang.org"
171178
source: hosted
172-
version: "1.1.0"
179+
version: "1.2.0"
173180
rxdart:
174181
dependency: transitive
175182
description:
176183
name: rxdart
177184
url: "https://pub.dartlang.org"
178185
source: hosted
179-
version: "0.27.0"
186+
version: "0.27.2"
180187
rxdart_ext:
181188
dependency: transitive
182189
description:
183190
name: rxdart_ext
184191
url: "https://pub.dartlang.org"
185192
source: hosted
186-
version: "0.1.0"
193+
version: "0.1.2"
187194
shared_preferences:
188195
dependency: "direct main"
189196
description:
190197
name: shared_preferences
191198
url: "https://pub.dartlang.org"
192199
source: hosted
193-
version: "2.0.5"
200+
version: "2.0.7"
194201
shared_preferences_linux:
195202
dependency: transitive
196203
description:
@@ -237,7 +244,7 @@ packages:
237244
name: source_span
238245
url: "https://pub.dartlang.org"
239246
source: hosted
240-
version: "1.8.0"
247+
version: "1.8.1"
241248
stack_trace:
242249
dependency: transitive
243250
description:
@@ -272,7 +279,7 @@ packages:
272279
name: test_api
273280
url: "https://pub.dartlang.org"
274281
source: hosted
275-
version: "0.2.19"
282+
version: "0.4.2"
276283
typed_data:
277284
dependency: transitive
278285
description:
@@ -303,4 +310,4 @@ packages:
303310
version: "0.2.0"
304311
sdks:
305312
dart: ">=2.12.0 <3.0.0"
306-
flutter: ">=1.20.0"
313+
flutter: ">=2.0.0"

pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ issue_tracker: https://github.com/hoc081098/rx_shared_preferences/issues
77

88
environment:
99
sdk: '>=2.12.0 <3.0.0'
10+
flutter: '>=2.0.0 <3.0.0'
1011

1112
dependencies:
1213
flutter:
@@ -18,6 +19,6 @@ dependencies:
1819
dev_dependencies:
1920
flutter_test:
2021
sdk: flutter
21-
pedantic: ^1.11.0
22+
flutter_lints: ^1.0.4
2223
shared_preferences_platform_interface: ^2.0.0
2324
collection: ^1.15.0

test/adapter_test.dart

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ void main() {
135135
(e, s) => expect(e, isA<StateError>()),
136136
);
137137

138-
store.failedMethod = MethodCall('setValue');
139-
[
138+
store.failedMethod = const MethodCall('setValue');
139+
for (final f in [
140140
adapter.setString('String', kTestValues2['flutter.String'] as String),
141141
adapter.setBool('bool', kTestValues2['flutter.bool'] as bool),
142142
adapter.setInt('int', kTestValues2['flutter.int'] as int),
@@ -148,7 +148,9 @@ void main() {
148148
user2,
149149
(u) => jsonEncode(u),
150150
),
151-
].forEach((f) => expect(f, throwsPlatformException));
151+
]) {
152+
expect(f, throwsPlatformException);
153+
}
152154
});
153155

154156
test('removing', () async {
@@ -170,7 +172,7 @@ void main() {
170172
growable: true,
171173
));
172174

173-
store.failedMethod = MethodCall('remove');
175+
store.failedMethod = const MethodCall('remove');
174176
expect(adapter.remove(key), throwsPlatformException);
175177
});
176178

@@ -192,7 +194,7 @@ void main() {
192194
expect(await adapter.getStringList('List'), null);
193195
expect(store.log, <Matcher>[isMethodCall('clear', arguments: null)]);
194196

195-
store.failedMethod = MethodCall('clear');
197+
store.failedMethod = const MethodCall('clear');
196198
expect(adapter.clear(), throwsPlatformException);
197199
});
198200

@@ -209,7 +211,7 @@ void main() {
209211

210212
SharedPreferencesStorePlatform.instance =
211213
store = FakeSharedPreferencesStore(kTestValues2)
212-
..failedMethod = MethodCall('getAll');
214+
..failedMethod = const MethodCall('getAll');
213215
expect(adapter.reload(), throwsPlatformException);
214216
});
215217

@@ -235,7 +237,7 @@ void main() {
235237
);
236238

237239
expect(
238-
SetEquality<String>().equals(keys, expected),
240+
const SetEquality<String>().equals(keys, expected),
239241
isTrue,
240242
);
241243
});

test/fake_shared_prefs_store.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class FakeSharedPreferencesStore implements SharedPreferencesStorePlatform {
4444
if (failedMethod?.method == 'clear') {
4545
return Future.value(false);
4646
}
47-
log.add(MethodCall('clear'));
47+
log.add(const MethodCall('clear'));
4848
return backend.clear();
4949
}
5050

@@ -55,7 +55,7 @@ class FakeSharedPreferencesStore implements SharedPreferencesStorePlatform {
5555
PlatformException(code: 'error', message: 'Cannot getAll'),
5656
);
5757
}
58-
log.add(MethodCall('getAll'));
58+
log.add(const MethodCall('getAll'));
5959
return backend.getAll();
6060
}
6161

0 commit comments

Comments
 (0)