Skip to content

Commit 3bf4564

Browse files
kevmookevmoo
authored
Latest mono_repo, Update SDK constraints, added a few more lints (#820)
1 parent 3b6afe9 commit 3bf4564

File tree

12 files changed

+47
-41
lines changed

12 files changed

+47
-41
lines changed

‎.github/workflows/dart.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created with package:mono_repo v3.4.6
1+
# Created with package:mono_repo v3.4.7
22
name: Dart CI
33
on:
44
push:
@@ -27,32 +27,32 @@ jobs:
2727
restore-keys: |
2828
os:ubuntu-latest;pub-cache-hosted
2929
os:ubuntu-latest
30-
- uses: dart-lang/setup-dart@v0.3
30+
- uses: dart-lang/setup-dart@v1.0
3131
with:
3232
sdk: stable
3333
- id: checkout
3434
uses: actions/checkout@v2
3535
- name: mono_repo self validate
36-
run: pub global activate mono_repo 3.4.6
36+
run: pub global activate mono_repo 3.4.7
3737
- name: mono_repo self validate
3838
run: pub global run mono_repo generate --validate
3939
job_002:
40-
name: "analyzer_and_format; Dart beta; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
40+
name: "analyzer_and_format; Dart 2.12.0; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
4141
runs-on: ubuntu-latest
4242
steps:
4343
- name: Cache Pub hosted dependencies
4444
uses: actions/cache@v2
4545
with:
4646
path: "~/.pub-cache/hosted"
47-
key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:dartfmt-dartanalyzer"
47+
key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:dartfmt-dartanalyzer"
4848
restore-keys: |
49-
os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
50-
os:ubuntu-latest;pub-cache-hosted;dart:beta
49+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
50+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
5151
os:ubuntu-latest;pub-cache-hosted
5252
os:ubuntu-latest
53-
- uses: dart-lang/setup-dart@v0.3
53+
- uses: dart-lang/setup-dart@v1.0
5454
with:
55-
sdk: beta
55+
sdk: "2.12.0"
5656
- id: checkout
5757
uses: actions/checkout@v2
5858
- id: _test_yaml_pub_upgrade
@@ -134,7 +134,7 @@ jobs:
134134
os:ubuntu-latest;pub-cache-hosted;dart:dev
135135
os:ubuntu-latest;pub-cache-hosted
136136
os:ubuntu-latest
137-
- uses: dart-lang/setup-dart@v0.3
137+
- uses: dart-lang/setup-dart@v1.0
138138
with:
139139
sdk: dev
140140
- id: checkout
@@ -205,22 +205,22 @@ jobs:
205205
working-directory: json_serializable
206206
run: dartanalyzer --fatal-infos .
207207
job_004:
208-
name: "unit_test; Dart beta; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test`"
208+
name: "unit_test; Dart 2.12.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test`"
209209
runs-on: ubuntu-latest
210210
steps:
211211
- name: Cache Pub hosted dependencies
212212
uses: actions/cache@v2
213213
with:
214214
path: "~/.pub-cache/hosted"
215-
key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
215+
key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
216216
restore-keys: |
217-
os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable
218-
os:ubuntu-latest;pub-cache-hosted;dart:beta
217+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable
218+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
219219
os:ubuntu-latest;pub-cache-hosted
220220
os:ubuntu-latest
221-
- uses: dart-lang/setup-dart@v0.3
221+
- uses: dart-lang/setup-dart@v1.0
222222
with:
223-
sdk: beta
223+
sdk: "2.12.0"
224224
- id: checkout
225225
uses: actions/checkout@v2
226226
- id: _test_yaml_pub_upgrade
@@ -277,7 +277,7 @@ jobs:
277277
os:ubuntu-latest;pub-cache-hosted;dart:dev
278278
os:ubuntu-latest;pub-cache-hosted
279279
os:ubuntu-latest
280-
- uses: dart-lang/setup-dart@v0.3
280+
- uses: dart-lang/setup-dart@v1.0
281281
with:
282282
sdk: dev
283283
- id: checkout
@@ -323,22 +323,22 @@ jobs:
323323
- job_002
324324
- job_003
325325
job_006:
326-
name: "unit_test; Dart beta; PKG: json_serializable; `pub run test -p chrome`"
326+
name: "unit_test; Dart 2.12.0; PKG: json_serializable; `pub run test -p chrome`"
327327
runs-on: ubuntu-latest
328328
steps:
329329
- name: Cache Pub hosted dependencies
330330
uses: actions/cache@v2
331331
with:
332332
path: "~/.pub-cache/hosted"
333-
key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:json_serializable;commands:test_2"
333+
key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:json_serializable;commands:test_2"
334334
restore-keys: |
335-
os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:json_serializable
336-
os:ubuntu-latest;pub-cache-hosted;dart:beta
335+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:json_serializable
336+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
337337
os:ubuntu-latest;pub-cache-hosted
338338
os:ubuntu-latest
339-
- uses: dart-lang/setup-dart@v0.3
339+
- uses: dart-lang/setup-dart@v1.0
340340
with:
341-
sdk: beta
341+
sdk: "2.12.0"
342342
- id: checkout
343343
uses: actions/checkout@v2
344344
- id: json_serializable_pub_upgrade
@@ -368,7 +368,7 @@ jobs:
368368
os:ubuntu-latest;pub-cache-hosted;dart:dev
369369
os:ubuntu-latest;pub-cache-hosted
370370
os:ubuntu-latest
371-
- uses: dart-lang/setup-dart@v0.3
371+
- uses: dart-lang/setup-dart@v1.0
372372
with:
373373
sdk: dev
374374
- id: checkout
@@ -387,22 +387,22 @@ jobs:
387387
- job_002
388388
- job_003
389389
job_008:
390-
name: "ensure_build; Dart beta; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
390+
name: "ensure_build; Dart 2.12.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
391391
runs-on: ubuntu-latest
392392
steps:
393393
- name: Cache Pub hosted dependencies
394394
uses: actions/cache@v2
395395
with:
396396
path: "~/.pub-cache/hosted"
397-
key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_1"
397+
key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_1"
398398
restore-keys: |
399-
os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable
400-
os:ubuntu-latest;pub-cache-hosted;dart:beta
399+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable
400+
os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
401401
os:ubuntu-latest;pub-cache-hosted
402402
os:ubuntu-latest
403-
- uses: dart-lang/setup-dart@v0.3
403+
- uses: dart-lang/setup-dart@v1.0
404404
with:
405-
sdk: beta
405+
sdk: "2.12.0"
406406
- id: checkout
407407
uses: actions/checkout@v2
408408
- id: _test_yaml_pub_upgrade
@@ -463,7 +463,7 @@ jobs:
463463
os:ubuntu-latest;pub-cache-hosted;dart:dev
464464
os:ubuntu-latest;pub-cache-hosted
465465
os:ubuntu-latest
466-
- uses: dart-lang/setup-dart@v0.3
466+
- uses: dart-lang/setup-dart@v1.0
467467
with:
468468
sdk: dev
469469
- id: checkout

‎_test_yaml/mono_pkg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# See https://github.com/google/mono_repo.dart for details on this file
22
dart:
3-
- beta # change this to 1.12.0 when it's released!
3+
- 2.12.0
44
- dev
55

66
stages:

‎_test_yaml/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: _test_yaml
22
publish_to: none
33

44
environment:
5-
sdk: '>=2.12.0-0 <3.0.0'
5+
sdk: '>=2.12.0 <3.0.0'
66

77
dev_dependencies:
88
build_runner: ^1.0.0

‎analysis_options.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ linter:
2121
- avoid_returning_null
2222
- avoid_returning_null_for_void
2323
- avoid_shadowing_type_parameters
24+
- avoid_single_cascade_in_expression_statements
2425
- avoid_types_as_parameter_names
2526
- avoid_unused_constructor_parameters
2627
- avoid_void_async
@@ -88,6 +89,7 @@ linter:
8889
- provide_deprecation_message
8990
- recursive_getters
9091
- slash_for_doc_comments
92+
- sort_child_properties_last
9193
- sort_pub_dependencies
9294
- test_types_in_equals
9395
- throw_in_finally
@@ -106,7 +108,10 @@ linter:
106108
- unnecessary_string_interpolations
107109
- unnecessary_this
108110
- unrelated_type_equality_checks
111+
- unsafe_html
112+
- use_full_hex_values_for_flutter_colors
109113
- use_function_type_syntax_for_parameters
114+
- use_is_even_rather_than_modulo
110115
- use_rethrow_when_possible
111116
- use_string_buffers
112117
- valid_regexps

‎checked_yaml/mono_pkg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# See https://github.com/google/mono_repo.dart for details on this file
22
dart:
3-
- beta # change this to 1.12.0 when it's released!
3+
- 2.12.0
44
- dev
55

66
stages:

‎checked_yaml/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
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.12.0-0 <3.0.0'
9+
sdk: '>=2.12.0 <3.0.0'
1010

1111
dependencies:
1212
json_annotation: ^4.0.0

‎example/mono_pkg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# See https://github.com/google/mono_repo.dart for details on this file
22
dart:
3-
- beta # change this to 1.12.0 when it's released!
3+
- 2.12.0
44
- dev
55

66
stages:

‎example/pubspec.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: example
2+
publish_to: none
23

34
environment:
4-
sdk: '>=2.12.0-0 <3.0.0'
5+
sdk: '>=2.12.0 <3.0.0'
56

67
dependencies:
78
json_annotation: ^4.0.0

‎json_annotation/mono_pkg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# See https://github.com/google/mono_repo.dart for details on this file
22
dart:
3-
- beta # change this to 1.12.0 when it's released!
3+
- 2.12.0
44
- dev
55

66
stages:

‎json_annotation/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
`json_serializable` package.
66
repository: https://github.com/google/json_serializable.dart
77
environment:
8-
sdk: '>=2.12.0-0 <3.0.0'
8+
sdk: '>=2.12.0 <3.0.0'
99

1010
# When changing JsonSerializable class.
1111
# dev_dependencies:

0 commit comments

Comments
 (0)