Skip to content

Commit 5aa5a5f

Browse files
kevmookevmoo
authored
chore: use latest dart_flutter_team_lints, bump min SDK (google#1289)
1 parent 38ca2bb commit 5aa5a5f

File tree

11 files changed

+57
-53
lines changed

11 files changed

+57
-53
lines changed

‎.github/workflows/dart.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ jobs:
4040
- name: mono_repo self validate
4141
run: dart pub global run mono_repo generate --validate
4242
job_002:
43-
name: "analyzer_and_format; Dart 2.18.0; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
43+
name: "analyzer_and_format; Dart 2.19.0; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Cache Pub hosted dependencies
4747
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
4848
with:
4949
path: "~/.pub-cache/hosted"
50-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:format-analyze"
50+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:format-analyze"
5151
restore-keys: |
52-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
53-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
52+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
53+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
5454
os:ubuntu-latest;pub-cache-hosted
5555
os:ubuntu-latest
5656
- name: Setup Dart SDK
5757
uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
5858
with:
59-
sdk: "2.18.0"
59+
sdk: "2.19.0"
6060
- id: checkout
6161
name: Checkout repository
6262
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
@@ -212,23 +212,23 @@ jobs:
212212
if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
213213
working-directory: json_serializable
214214
job_004:
215-
name: "unit_test; Dart 2.18.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `dart test`"
215+
name: "unit_test; Dart 2.19.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `dart test`"
216216
runs-on: ubuntu-latest
217217
steps:
218218
- name: Cache Pub hosted dependencies
219219
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
220220
with:
221221
path: "~/.pub-cache/hosted"
222-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
222+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
223223
restore-keys: |
224-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:_test_yaml-checked_yaml-example-json_serializable
225-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
224+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:_test_yaml-checked_yaml-example-json_serializable
225+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
226226
os:ubuntu-latest;pub-cache-hosted
227227
os:ubuntu-latest
228228
- name: Setup Dart SDK
229229
uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
230230
with:
231-
sdk: "2.18.0"
231+
sdk: "2.19.0"
232232
- id: checkout
233233
name: Checkout repository
234234
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
@@ -273,23 +273,23 @@ jobs:
273273
- job_002
274274
- job_003
275275
job_005:
276-
name: "unit_test; Dart 2.18.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/annotation_version_test.dart`"
276+
name: "unit_test; Dart 2.19.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/annotation_version_test.dart`"
277277
runs-on: ubuntu-latest
278278
steps:
279279
- name: Cache Pub hosted dependencies
280280
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
281281
with:
282282
path: "~/.pub-cache/hosted"
283-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:json_serializable;commands:test_3"
283+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:json_serializable;commands:test_3"
284284
restore-keys: |
285-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:json_serializable
286-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
285+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:json_serializable
286+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
287287
os:ubuntu-latest;pub-cache-hosted
288288
os:ubuntu-latest
289289
- name: Setup Dart SDK
290290
uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
291291
with:
292-
sdk: "2.18.0"
292+
sdk: "2.19.0"
293293
- id: checkout
294294
name: Checkout repository
295295
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
@@ -307,23 +307,23 @@ jobs:
307307
- job_002
308308
- job_003
309309
job_006:
310-
name: "unit_test; Dart 2.18.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
310+
name: "unit_test; Dart 2.19.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
311311
runs-on: ubuntu-latest
312312
steps:
313313
- name: Cache Pub hosted dependencies
314314
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
315315
with:
316316
path: "~/.pub-cache/hosted"
317-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:json_serializable;commands:test_1"
317+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:json_serializable;commands:test_1"
318318
restore-keys: |
319-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:json_serializable
320-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
319+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:json_serializable
320+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
321321
os:ubuntu-latest;pub-cache-hosted
322322
os:ubuntu-latest
323323
- name: Setup Dart SDK
324324
uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
325325
with:
326-
sdk: "2.18.0"
326+
sdk: "2.19.0"
327327
- id: checkout
328328
name: Checkout repository
329329
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
@@ -341,23 +341,23 @@ jobs:
341341
- job_002
342342
- job_003
343343
job_007:
344-
name: "unit_test; Dart 2.18.0; PKG: json_serializable; `dart test -p chrome`"
344+
name: "unit_test; Dart 2.19.0; PKG: json_serializable; `dart test -p chrome`"
345345
runs-on: ubuntu-latest
346346
steps:
347347
- name: Cache Pub hosted dependencies
348348
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
349349
with:
350350
path: "~/.pub-cache/hosted"
351-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:json_serializable;commands:test_2"
351+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:json_serializable;commands:test_2"
352352
restore-keys: |
353-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:json_serializable
354-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
353+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:json_serializable
354+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
355355
os:ubuntu-latest;pub-cache-hosted
356356
os:ubuntu-latest
357357
- name: Setup Dart SDK
358358
uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
359359
with:
360-
sdk: "2.18.0"
360+
sdk: "2.19.0"
361361
- id: checkout
362362
name: Checkout repository
363363
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
@@ -538,23 +538,23 @@ jobs:
538538
- job_002
539539
- job_003
540540
job_012:
541-
name: "ensure_build; Dart 2.18.0; PKGS: _test_yaml, checked_yaml, example; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
541+
name: "ensure_build; Dart 2.19.0; PKGS: _test_yaml, checked_yaml, example; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
542542
runs-on: ubuntu-latest
543543
steps:
544544
- name: Cache Pub hosted dependencies
545545
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
546546
with:
547547
path: "~/.pub-cache/hosted"
548-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:_test_yaml-checked_yaml-example;commands:test_1"
548+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:_test_yaml-checked_yaml-example;commands:test_1"
549549
restore-keys: |
550-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:_test_yaml-checked_yaml-example
551-
os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
550+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0;packages:_test_yaml-checked_yaml-example
551+
os:ubuntu-latest;pub-cache-hosted;sdk:2.19.0
552552
os:ubuntu-latest;pub-cache-hosted
553553
os:ubuntu-latest
554554
- name: Setup Dart SDK
555555
uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
556556
with:
557-
sdk: "2.18.0"
557+
sdk: "2.19.0"
558558
- id: checkout
559559
name: Checkout repository
560560
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c

‎_test_yaml/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: _test_yaml
22
publish_to: none
33

44
environment:
5-
sdk: '>=2.18.0 <3.0.0'
5+
sdk: '>=2.19.0 <3.0.0'
66

77
dev_dependencies:
88
_json_serial_shared_test:
99
path: ../shared_test
1010
build_runner: ^2.0.0
1111
build_verify: ^3.0.0
1212
checked_yaml: any
13-
dart_flutter_team_lints: ^0.1.0
13+
dart_flutter_team_lints: ^1.0.0
1414
json_annotation: ^4.7.0
1515
json_serializable: any
1616
path: ^1.8.2

‎analysis_options.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,8 @@ linter:
1414
- avoid_void_async
1515
- cancel_subscriptions
1616
- cascade_invocations
17-
- collection_methods_unrelated_type
18-
- combinators_ordering
1917
- comment_references
20-
- dangling_library_doc_comments
21-
- implicit_call_tearoffs
2218
- join_return_with_assignment
23-
- library_annotations
2419
- literal_only_boolean_expressions
2520
- missing_whitespace_between_adjacent_strings
2621
- no_runtimeType_toString
@@ -32,10 +27,7 @@ linter:
3227
- prefer_relative_imports
3328
- sort_child_properties_last
3429
- test_types_in_equals
35-
- unnecessary_library_directive
36-
- unreachable_from_main
3730
- unsafe_html
3831
- use_full_hex_values_for_flutter_colors
3932
- use_string_buffers
40-
- use_string_in_part_of_directives
4133
- use_super_parameters

‎checked_yaml/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.3-dev
2+
3+
- Require Dart 2.19
4+
15
## 2.0.2
26

37
- Require `json_annotation` `^4.3.0`

‎checked_yaml/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: checked_yaml
2-
version: 2.0.2
2+
version: 2.0.3-dev
33

44
description: >-
55
Generate more helpful exceptions when decoding YAML documents using
66
package:json_serializable and package:yaml.
77
repository: https://github.com/google/json_serializable.dart/tree/master/checked_yaml
88
environment:
9-
sdk: '>=2.18.0 <3.0.0'
9+
sdk: '>=2.19.0 <3.0.0'
1010

1111
dependencies:
1212
json_annotation: ^4.3.0
@@ -16,7 +16,7 @@ dependencies:
1616
dev_dependencies:
1717
build_runner: ^2.0.0
1818
build_verify: ^3.0.0
19-
dart_flutter_team_lints: ^0.1.0
19+
dart_flutter_team_lints: ^1.0.0
2020
json_serializable: ^6.0.0
2121
path: ^1.0.0
2222
test: ^1.16.0

‎example/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: example
22
publish_to: none
33

44
environment:
5-
sdk: '>=2.18.0 <3.0.0'
5+
sdk: '>=2.19.0 <3.0.0'
66

77
dependencies:
88
json_annotation: ^4.8.0
@@ -19,7 +19,7 @@ dev_dependencies:
1919
build_verify: ^3.0.0
2020

2121
# Not required to use `json_serializable`.
22-
dart_flutter_team_lints: ^0.1.0
22+
dart_flutter_team_lints: ^1.0.0
2323

2424
# REQUIRED!
2525
json_serializable: ^6.6.0

‎json_annotation/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.8.1-dev
2+
3+
- Require Dart 2.19
4+
15
## 4.8.0
26

37
- DEPRECATED `JsonKey.ignore`. Replaced by...

‎json_annotation/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
name: json_annotation
2-
version: 4.8.0
2+
version: 4.8.1-dev
33
description: >-
44
Classes and helper functions that support JSON code generation via the
55
`json_serializable` package.
66
repository: https://github.com/google/json_serializable.dart/tree/master/json_annotation
77

88
environment:
9-
sdk: '>=2.18.0 <3.0.0'
9+
sdk: '>=2.19.0 <3.0.0'
1010

1111
dependencies:
1212
meta: ^1.4.0
1313

1414
dev_dependencies:
15-
dart_flutter_team_lints: ^0.1.0
15+
dart_flutter_team_lints: ^1.0.0
1616
# When changing JsonSerializable class.
1717
# build_runner: ^2.0.0
1818
# json_serializable: any

‎json_serializable/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 6.6.2-dev
2+
3+
- Require Dart 2.19
4+
15
## 6.6.1
26

37
- Fix bug when `JsonKey.includeToJson` is `false`.

‎json_serializable/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: json_serializable
2-
version: 6.6.1
2+
version: 6.6.2-dev
33
description: >-
44
Automatically generate code for converting to and from JSON by annotating
55
Dart classes.
66
repository: https://github.com/google/json_serializable.dart/tree/master/json_serializable
77
environment:
8-
sdk: '>=2.18.0 <3.0.0'
8+
sdk: '>=2.19.0 <3.0.0'
99

1010
dependencies:
1111
analyzer: ^5.2.0
@@ -29,7 +29,7 @@ dev_dependencies:
2929
path: ../shared_test
3030
build_runner: ^2.0.0
3131
build_verify: ^3.0.0
32-
dart_flutter_team_lints: ^0.1.0
32+
dart_flutter_team_lints: ^1.0.0
3333
dart_style: ^2.0.0
3434
logging: ^1.0.0
3535
source_gen_test: ^1.0.0

0 commit comments

Comments
 (0)