Skip to content

Commit 54acb63

Browse files
davidmorgandavidmorgan
authored
Use Dart 3.7.0, reformat. (#762)
1 parent 2a6be7e commit 54acb63

34 files changed

+809
-808
lines changed

‎.github/workflows/dart.yml‎

Lines changed: 17 additions & 17 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: "analyze_format; linux; Dart 3.6.0; PKG: source_gen; `dart analyze`"
43+
name: "analyze_format; linux; Dart 3.7.0; PKG: source_gen; `dart analyze`"
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Cache Pub hosted dependencies
4747
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
4848
with:
4949
path: "~/.pub-cache/hosted"
50-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen;commands:analyze_1"
50+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen;commands:analyze_1"
5151
restore-keys: |
52-
os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen
53-
os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
52+
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen
53+
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
5454
os:ubuntu-latest;pub-cache-hosted
5555
os:ubuntu-latest
5656
- name: Setup Dart SDK
5757
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
5858
with:
59-
sdk: "3.6.0"
59+
sdk: "3.7.0"
6060
- id: checkout
6161
name: Checkout repository
6262
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -143,23 +143,23 @@ jobs:
143143
if: "always() && steps.source_gen_pub_upgrade.conclusion == 'success'"
144144
working-directory: source_gen
145145
job_004:
146-
name: "unit_test; linux; Dart 3.6.0; PKG: example_usage; `dart test --run-skipped`"
146+
name: "unit_test; linux; Dart 3.7.0; PKG: example_usage; `dart test --run-skipped`"
147147
runs-on: ubuntu-latest
148148
steps:
149149
- name: Cache Pub hosted dependencies
150150
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
151151
with:
152152
path: "~/.pub-cache/hosted"
153-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:example_usage;commands:test_0"
153+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:example_usage;commands:test_0"
154154
restore-keys: |
155-
os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:example_usage
156-
os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
155+
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:example_usage
156+
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
157157
os:ubuntu-latest;pub-cache-hosted
158158
os:ubuntu-latest
159159
- name: Setup Dart SDK
160160
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
161161
with:
162-
sdk: "3.6.0"
162+
sdk: "3.7.0"
163163
- id: checkout
164164
name: Checkout repository
165165
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -177,23 +177,23 @@ jobs:
177177
- job_002
178178
- job_003
179179
job_005:
180-
name: "unit_test; linux; Dart 3.6.0; PKG: source_gen; `dart test`"
180+
name: "unit_test; linux; Dart 3.7.0; PKG: source_gen; `dart test`"
181181
runs-on: ubuntu-latest
182182
steps:
183183
- name: Cache Pub hosted dependencies
184184
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
185185
with:
186186
path: "~/.pub-cache/hosted"
187-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen;commands:test_1"
187+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen;commands:test_1"
188188
restore-keys: |
189-
os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen
190-
os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
189+
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen
190+
os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
191191
os:ubuntu-latest;pub-cache-hosted
192192
os:ubuntu-latest
193193
- name: Setup Dart SDK
194194
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
195195
with:
196-
sdk: "3.6.0"
196+
sdk: "3.7.0"
197197
- id: checkout
198198
name: Checkout repository
199199
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -279,13 +279,13 @@ jobs:
279279
- job_002
280280
- job_003
281281
job_008:
282-
name: "unit_test; windows; Dart 3.6.0; PKG: source_gen; `dart test`"
282+
name: "unit_test; windows; Dart 3.7.0; PKG: source_gen; `dart test`"
283283
runs-on: windows-latest
284284
steps:
285285
- name: Setup Dart SDK
286286
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
287287
with:
288-
sdk: "3.6.0"
288+
sdk: "3.7.0"
289289
- id: checkout
290290
name: Checkout repository
291291
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

‎_test_annotations/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ publish_to: none
33
resolution: workspace
44

55
environment:
6-
sdk: ^3.6.0
6+
sdk: ^3.7.0
77

88
dev_dependencies:
99
dart_flutter_team_lints: ^3.1.0

‎analysis_options.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ linter:
2929
- prefer_const_declarations
3030
- prefer_expression_function_bodies
3131
- prefer_final_locals
32-
- require_trailing_commas
3332
- sort_child_properties_last
3433
- unnecessary_await_in_return
3534
- use_full_hex_values_for_flutter_colors

‎example/lib/builder.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import 'src/property_product_generator.dart';
2121
import 'src/property_sum_generator.dart';
2222

2323
Builder metadataLibraryBuilder(BuilderOptions options) => LibraryBuilder(
24-
MemberCountLibraryGenerator(),
25-
generatedExtension: '.info.dart',
26-
);
24+
MemberCountLibraryGenerator(),
25+
generatedExtension: '.info.dart',
26+
);
2727

2828
Builder productBuilder(BuilderOptions options) =>
2929
SharedPartBuilder([PropertyProductGenerator()], 'product');

‎example/lib/src/property_product_generator.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import 'utils.dart';
1010
class PropertyProductGenerator extends Generator {
1111
@override
1212
String generate(LibraryReader library, BuildStep buildStep) {
13-
final productNames = topLevelNumVariables(library)
14-
.map((element) => element.name)
15-
.join(' * ');
13+
final productNames = topLevelNumVariables(
14+
library,
15+
).map((element) => element.name).join(' * ');
1616

1717
return '''
1818
num allProduct() => $productNames;

‎example/lib/src/property_sum_generator.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import 'utils.dart';
1010
class PropertySumGenerator extends Generator {
1111
@override
1212
String generate(LibraryReader library, BuildStep buildStep) {
13-
final sumNames = topLevelNumVariables(library)
14-
.map((element) => element.name)
15-
.join(' + ');
13+
final sumNames = topLevelNumVariables(
14+
library,
15+
).map((element) => element.name).join(' + ');
1616

1717
return '''
1818
num allSum() => $sumNames;

‎example/lib/src/utils.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import 'package:source_gen/source_gen.dart';
99
/// have a type of [num].
1010
Iterable<TopLevelVariableElement> topLevelNumVariables(LibraryReader reader) =>
1111
reader.allElements.whereType<TopLevelVariableElement>().where(
12-
(element) =>
13-
element.type.isDartCoreNum ||
14-
element.type.isDartCoreInt ||
15-
element.type.isDartCoreDouble,
16-
);
12+
(element) =>
13+
element.type.isDartCoreNum ||
14+
element.type.isDartCoreInt ||
15+
element.type.isDartCoreDouble,
16+
);

‎example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ publish_to: none
33
resolution: workspace
44

55
environment:
6-
sdk: ^3.6.0
6+
sdk: ^3.7.0
77

88
dependencies:
99
analyzer: '>=6.9.0 <8.0.0'

‎example_usage/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ publish_to: none
33
resolution: workspace
44

55
environment:
6-
sdk: ^3.6.0
6+
sdk: ^3.7.0
77

88
dependencies:
99
source_gen_example:

‎source_gen/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.1-wip
2+
3+
- Require Dart 3.7.0
4+
15
## 2.0.0
26

37
- **Breaking Change**: Change `formatOutput` function to accept a language

0 commit comments

Comments
 (0)