Skip to content

Commit 321abdc

Browse files
authored
Merge pull request #118 from FlutterGen/build-bump-deps
build: bump analyzer 2.0.0
2 parents 6796a8a + 7207145 commit 321abdc

20 files changed

+121
-60
lines changed

.github/workflows/dart-ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@ jobs:
2222
- name: Set environment
2323
run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
2424

25+
- name: Install melos
26+
run: |
27+
flutter pub global activate melos
28+
2529
- name: Get Dart and Flutter dependencies
2630
run: |
2731
make dependencies
32+
melos bootstrap
2833
2934
- name: Run tests for our dart project.
3035
run: |

.idea/.name

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

.idea/runConfigurations/melos_bootstrap.xml

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

.idea/runConfigurations/melos_clean.xml

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

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ generate-with-command:
2929
dart packages/command/bin/flutter_gen_command.dart --config example/pubspec.yaml
3030

3131
generate-with-runner:
32-
cd example && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
32+
cd example && flutter pub run build_runner build --delete-conflicting-outputs && cd ..
3333

3434
unit-test:
3535
cd packages/core/ && dart run test && cd ..

melos.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: FlutterGen
2+
3+
packages:
4+
- packages/**
5+
6+
# TODO(mao): migrate from Makefile
7+
scripts:

packages/command/pubspec.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ packages:
77
name: _fe_analyzer_shared
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "18.0.0"
10+
version: "23.0.0"
1111
analyzer:
1212
dependency: transitive
1313
description:
1414
name: analyzer
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.2.0"
17+
version: "2.0.0"
1818
args:
1919
dependency: "direct main"
2020
description:
@@ -84,7 +84,7 @@ packages:
8484
name: dart_style
8585
url: "https://pub.dartlang.org"
8686
source: hosted
87-
version: "2.0.0"
87+
version: "2.0.3"
8888
dartx:
8989
dependency: transitive
9090
description:
@@ -133,7 +133,7 @@ packages:
133133
name: meta
134134
url: "https://pub.dartlang.org"
135135
source: hosted
136-
version: "1.3.0"
136+
version: "1.7.0"
137137
mime:
138138
dependency: transitive
139139
description:

packages/command/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ dependencies:
2323
dev_dependencies:
2424
effective_dart: '>=1.3.0 <2.0.0'
2525

26-
dependency_overrides:
27-
flutter_gen_core:
28-
path: ../core
26+
# dependency_overrides:
27+
# flutter_gen_core:
28+
# path: ../core

packages/core/pubspec.lock

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ packages:
77
name: _fe_analyzer_shared
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "18.0.0"
10+
version: "23.0.0"
1111
analyzer:
1212
dependency: "direct main"
1313
description:
1414
name: analyzer
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.2.0"
17+
version: "2.0.0"
1818
args:
1919
dependency: "direct main"
2020
description:
@@ -42,7 +42,7 @@ packages:
4242
name: build
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "2.0.0"
45+
version: "2.0.3"
4646
build_config:
4747
dependency: transitive
4848
description:
@@ -63,7 +63,7 @@ packages:
6363
name: build_resolvers
6464
url: "https://pub.dartlang.org"
6565
source: hosted
66-
version: "2.0.0"
66+
version: "2.0.4"
6767
build_runner:
6868
dependency: "direct dev"
6969
description:
@@ -154,7 +154,7 @@ packages:
154154
name: coverage
155155
url: "https://pub.dartlang.org"
156156
source: hosted
157-
version: "0.15.2"
157+
version: "1.0.3"
158158
crypto:
159159
dependency: transitive
160160
description:
@@ -168,7 +168,7 @@ packages:
168168
name: dart_style
169169
url: "https://pub.dartlang.org"
170170
source: hosted
171-
version: "2.0.0"
171+
version: "2.0.3"
172172
dartx:
173173
dependency: "direct main"
174174
description:
@@ -197,6 +197,13 @@ packages:
197197
url: "https://pub.dartlang.org"
198198
source: hosted
199199
version: "1.0.0"
200+
frontend_server_client:
201+
dependency: transitive
202+
description:
203+
name: frontend_server_client
204+
url: "https://pub.dartlang.org"
205+
source: hosted
206+
version: "2.1.0"
200207
glob:
201208
dependency: transitive
202209
description:
@@ -245,14 +252,14 @@ packages:
245252
name: json_annotation
246253
url: "https://pub.dartlang.org"
247254
source: hosted
248-
version: "4.0.1"
255+
version: "4.1.0"
249256
json_serializable:
250257
dependency: "direct dev"
251258
description:
252259
name: json_serializable
253260
url: "https://pub.dartlang.org"
254261
source: hosted
255-
version: "4.1.3"
262+
version: "5.0.0"
256263
logging:
257264
dependency: transitive
258265
description:
@@ -273,7 +280,7 @@ packages:
273280
name: meta
274281
url: "https://pub.dartlang.org"
275282
source: hosted
276-
version: "1.3.0"
283+
version: "1.7.0"
277284
mime:
278285
dependency: "direct main"
279286
description:
@@ -287,7 +294,7 @@ packages:
287294
name: node_preamble
288295
url: "https://pub.dartlang.org"
289296
source: hosted
290-
version: "1.4.13"
297+
version: "2.0.1"
291298
package_config:
292299
dependency: transitive
293300
description:
@@ -371,7 +378,14 @@ packages:
371378
name: source_gen
372379
url: "https://pub.dartlang.org"
373380
source: hosted
374-
version: "1.0.0"
381+
version: "1.0.5"
382+
source_helper:
383+
dependency: transitive
384+
description:
385+
name: source_helper
386+
url: "https://pub.dartlang.org"
387+
source: hosted
388+
version: "1.2.1"
375389
source_map_stack_trace:
376390
dependency: transitive
377391
description:
@@ -434,21 +448,21 @@ packages:
434448
name: test
435449
url: "https://pub.dartlang.org"
436450
source: hosted
437-
version: "1.16.5"
451+
version: "1.17.10"
438452
test_api:
439453
dependency: transitive
440454
description:
441455
name: test_api
442456
url: "https://pub.dartlang.org"
443457
source: hosted
444-
version: "0.2.19"
458+
version: "0.4.2"
445459
test_core:
446460
dependency: transitive
447461
description:
448462
name: test_core
449463
url: "https://pub.dartlang.org"
450464
source: hosted
451-
version: "0.3.15"
465+
version: "0.4.0"
452466
time:
453467
dependency: transitive
454468
description:

packages/core/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies:
2424
json_annotation: '>=4.0.0 <5.0.0'
2525

2626
dart_style: '>=2.0.0 <3.0.0'
27-
analyzer: '>=1.0.0 <2.0.0'
27+
analyzer: '>=2.0.0 <3.0.0'
2828
args: '>=2.0.0 <3.0.0'
2929
pub_semver: '>=1.4.0 <3.0.0'
3030
source_span: '>=1.6.0 <2.0.0'
@@ -33,4 +33,4 @@ dev_dependencies:
3333
test: '>=1.16.0 <2.0.0'
3434
effective_dart: '>=1.3.0 <2.0.0'
3535
build_runner: '>=1.10.0 <2.0.0'
36-
json_serializable: '>=3.5.0 <5.0.0'
36+
json_serializable: '>=5.0.0 <6.0.0'

0 commit comments

Comments
 (0)