Skip to content

Commit d4ccec6

Browse files
authored
Merge branch 'google:master' into master
2 parents 9b6625f + 55d68f4 commit d4ccec6

File tree

153 files changed

+1510
-1565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+1510
-1565
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
version: 2
55
updates:
66

7-
- package-ecosystem: "github-actions"
8-
directory: "/"
7+
- package-ecosystem: github-actions
8+
directory: /
99
schedule:
10-
interval: "monthly"
10+
interval: monthly
11+
labels:
12+
- autosubmit
13+
groups:
14+
dependencies:
15+
patterns:
16+
- "*"

.github/workflows/dart.yml

Lines changed: 122 additions & 265 deletions
Large diffs are not rendered by default.

.github/workflows/markdown_linter.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,10 @@ jobs:
1111
markdown-link-check:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
15-
- uses: gaurav-nelson/github-action-markdown-link-check@v1
14+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
15+
- uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368
1616
markdown_lint:
1717
runs-on: ubuntu-latest
18-
strategy:
19-
matrix:
20-
node-version: [ 14.x ]
2118
steps:
22-
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
23-
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
25-
with:
26-
node-version: ${{ matrix.node-version }}
27-
- name: Install dependencies
28-
run: npm install --global markdownlint-cli2
29-
- name: Run lint check
30-
run: markdownlint-cli2-fix "**/*.md"
19+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
20+
- uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8

.github/workflows/no-response.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
# A workflow to close issues where the author hasn't responded to a request for
2-
# more information; see https://github.com/godofredoc/no-response for docs.
2+
# more information; see https://github.com/actions/stale.
33

44
name: No Response
55

6-
# Both `issue_comment` and `scheduled` event types are required.
6+
# Run as a daily cron.
77
on:
8-
issue_comment:
9-
types: [created]
108
schedule:
119
# Every day at 8am
1210
- cron: '0 8 * * *'
1311

1412
# All permissions not specified are set to 'none'.
1513
permissions:
1614
issues: write
15+
pull-requests: write
1716

1817
jobs:
19-
noResponse:
18+
no-response:
2019
runs-on: ubuntu-latest
2120
if: ${{ github.repository_owner == 'google' }}
2221
steps:
23-
- uses: godofredoc/no-response@0ce2dc0e63e1c7d2b87752ceed091f6d32c9df09
24-
with:
25-
responseRequiredLabel: "State: needs info"
26-
daysUntilClose: 14
27-
# Comment to post when closing an Issue for lack of response.
28-
closeComment: >
29-
Without additional information we're not able to resolve this
30-
issue, so it will be closed at this time. You're still free to add
31-
more info and respond to any questions above, though. We'll reopen
32-
the case if you do. Thanks for your contribution!
33-
token: ${{ github.token }}
22+
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e
23+
with:
24+
# Don't automatically mark inactive issues+PRs as stale.
25+
days-before-stale: -1
26+
# Close needs-info issues and PRs after 14 days of inactivity.
27+
days-before-close: 14
28+
stale-issue-label: "needs-info"
29+
close-issue-message: >
30+
Without additional information we're not able to resolve this issue.
31+
Feel free to add more info or respond to any questions above and we
32+
can reopen the case. Thanks for your contribution!
33+
stale-pr-label: "needs-info"
34+
close-pr-message: >
35+
Without additional information we're not able to resolve this PR.
36+
Feel free to add more info or respond to any questions above.
37+
Thanks for your contribution!

.github/workflows/publish.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ jobs:
1212
publish:
1313
if: ${{ github.repository_owner == 'google' }}
1414
uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main
15+
permissions:
16+
id-token: write # Required for authentication using OIDC
17+
pull-requests: write # Required for writing the pull request note

_test_yaml/mono_pkg.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ stages:
88
- group:
99
- format
1010
- analyze: --fatal-infos .
11+
sdk: dev
12+
- group:
13+
- analyze
14+
sdk: pubspec
1115
- unit_test:
1216
- test
1317
- ensure_build:

_test_yaml/pubspec.yaml

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

44
environment:
5-
sdk: ^3.0.0
5+
sdk: ^3.5.0
6+
7+
resolution: workspace
68

79
dev_dependencies:
810
_json_serial_shared_test:
911
path: ../shared_test
10-
build_runner: ^2.0.0
12+
build_runner: ^2.2.1
1113
build_verify: ^3.0.0
12-
checked_yaml: any
13-
dart_flutter_team_lints: ^1.0.0
14-
json_annotation: ^4.7.0
15-
json_serializable: any
14+
checked_yaml: ^2.0.4-wip
15+
json_annotation: ^4.9.0
16+
json_serializable: ^6.8.0
1617
path: ^1.8.2
17-
test: ^1.6.0
18+
test: ^1.21.6
1819
yaml: ^3.0.0
19-
20-
dependency_overrides:
21-
checked_yaml:
22-
path: ../checked_yaml
23-
json_annotation:
24-
path: ../json_annotation
25-
json_serializable:
26-
path: ../json_serializable

_test_yaml/test/ensure_build_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@TestOn('vm')
66
@Tags(['presubmit-only'])
7-
library test;
7+
library;
88

99
import 'package:build_verify/build_verify.dart';
1010
import 'package:test/test.dart';

_test_yaml/test/src/build_config.g.dart

Lines changed: 19 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_test_yaml/test/yaml_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
@TestOn('vm')
6-
library test;
6+
library;
77

88
import 'dart:io';
99

analysis_options.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,17 @@ linter:
1414
- avoid_void_async
1515
- cancel_subscriptions
1616
- cascade_invocations
17-
- comment_references
1817
- invalid_case_patterns
1918
- join_return_with_assignment
2019
- literal_only_boolean_expressions
2120
- missing_whitespace_between_adjacent_strings
2221
- no_runtimeType_toString
2322
- package_api_docs
24-
- prefer_const_constructors
2523
- prefer_const_declarations
2624
- prefer_expression_function_bodies
2725
- prefer_final_locals
28-
- prefer_relative_imports
2926
- sort_child_properties_last
30-
- test_types_in_equals
31-
- type_literal_in_constant_pattern
3227
- unnecessary_breaks
3328
- unsafe_html
3429
- use_full_hex_values_for_flutter_colors
3530
- use_string_buffers
36-
- 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.4-wip
2+
3+
- Require Dart 3.5
4+
15
## 2.0.3
26

37
- Require Dart 2.19

checked_yaml/example/example.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

checked_yaml/mono_pkg.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ stages:
88
- group:
99
- format
1010
- analyze: --fatal-infos .
11-
11+
sdk: dev
12+
- group:
13+
- analyze
14+
sdk: pubspec
1215
- unit_test:
1316
- test
1417
- ensure_build:

checked_yaml/pubspec.yaml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: checked_yaml
2-
version: 2.0.3
2+
version: 2.0.4-wip
33

44
description: >-
55
Generate more helpful exceptions when decoding YAML documents using
@@ -13,24 +13,19 @@ topics:
1313
- codegen
1414

1515
environment:
16-
sdk: '>=2.19.0 <3.0.0'
16+
sdk: ^3.5.0
17+
18+
resolution: workspace
1719

1820
dependencies:
1921
json_annotation: ^4.3.0
2022
source_span: ^1.8.0
2123
yaml: ^3.0.0
2224

2325
dev_dependencies:
24-
build_runner: ^2.0.0
26+
build_runner: ^2.0.6
2527
build_verify: ^3.0.0
26-
dart_flutter_team_lints: ^1.0.0
2728
json_serializable: ^6.0.0
28-
path: ^1.0.0
29-
test: ^1.16.0
29+
path: ^1.8.0
30+
test: ^1.17.10
3031
test_process: ^2.0.0
31-
32-
#dependency_overrides:
33-
# json_annotation:
34-
# path: ../json_annotation
35-
# json_serializable:
36-
# path: ../json_serializable

checked_yaml/test/ensure_build_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@TestOn('vm')
66
@Tags(['presubmit-only'])
7-
library test;
7+
library;
88

99
import 'package:build_verify/build_verify.dart';
1010
import 'package:test/test.dart';

checked_yaml/test/example_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ line 1, column 1: Required keys are missing: name.
3333
_expectThrows(
3434
'{"name":"something"}',
3535
r'''
36-
line 1, column 1: Missing key "count". type 'Null' is not a subtype of type 'int' in type cast
36+
line 1, column 1: Missing key "count". type 'Null' is not a subtype of type 'num' in type cast
3737
3838
1 │ {"name":"something"}
3939
│ ^^^^^^^^^^^^^^^^^^^^
@@ -114,7 +114,7 @@ line 1, column 10: Unsupported value for "name". Cannot be empty.
114114
});
115115
}
116116

117-
void _expectThrows(String yamlContent, matcher) => expect(
117+
void _expectThrows(String yamlContent, String matcher) => expect(
118118
() => _run(yamlContent),
119119
throwsA(
120120
isA<ParsedYamlException>().having(

example/README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ dependencies to your `pubspec.yaml`.
55

66
```yaml
77
dependencies:
8-
json_annotation: ^4.8.0
8+
json_annotation: ^4.9.0
99

1010
dev_dependencies:
1111
build_runner: ^2.3.3
12-
json_serializable: ^6.6.0
12+
json_serializable: ^6.8.0
1313
```
1414
1515
Annotate your code with classes defined in
@@ -23,7 +23,7 @@ Annotate your code with classes defined in
2323
Run `dart run build_runner build` to generate files into your source directory.
2424

2525
```console
26-
> dart pub run build_runner build
26+
> dart run build_runner build
2727
[INFO] ensureBuildScript: Generating build script completed, took 368ms
2828
[INFO] BuildDefinition: Reading cached asset graph completed, took 54ms
2929
[INFO] BuildDefinition: Checking for updates since last build completed, took 663ms
@@ -32,9 +32,6 @@ Run `dart run build_runner build` to generate files into your source directory.
3232
[INFO] Build: Succeeded after 4687ms with 1 outputs
3333
```
3434

35-
_NOTE_: If you're using Flutter, replace `dart run` with
36-
`flutter pub run`.
37-
3835
[example]: lib/example.dart
3936
[example_g]: lib/example.g.dart
4037
[json_annotation]: https://pub.dev/packages/json_annotation

0 commit comments

Comments
 (0)