Skip to content

Commit 83f01a7

Browse files
lcdsmaowasabeef
andauthored
build: bump deps (#182)
* chore: use melos bootstrap * build: bump dartx 1.0.0 * build: bump json_serializable * chore: melos without exec * fix: hack melos with runing build_runner * build: add build_runner * ci: update sdks Co-authored-by: wasabeef <[email protected]>
1 parent 972eefe commit 83f01a7

File tree

14 files changed

+64
-78
lines changed

14 files changed

+64
-78
lines changed

.github/workflows/dart-ci.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- uses: actions/checkout@v2
1818
- uses: subosito/flutter-action@v1
1919
with:
20-
flutter-version: '2.5.3'
20+
flutter-version: '2.8.1'
2121
- uses: dart-lang/setup-dart@v1
2222
with:
23-
sdk: '2.14.4'
23+
sdk: '2.15.0'
2424

2525
- name: Set environment
2626
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
@@ -33,15 +33,14 @@ jobs:
3333
- name: Get dependencies for macos and ubuntu
3434
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
3535
run: |
36-
dart pub global activate melos 1.0.0-dev.14
37-
melos run pub:get
36+
dart pub global activate melos
37+
melos bootstrap
3838
3939
- name: Get dependencies for Windows
4040
if: startsWith(matrix.os, 'windows')
4141
run: |
42-
dart pub global activate melos 1.0.0-dev.14
43-
melos exec --flutter -- flutter pub get
44-
melos exec --no-flutter -- dart pub get
42+
dart pub global activate melos
43+
melos bootstrap
4544
4645
- name: Run tests for our dart project.
4746
if: startsWith(matrix.os, 'ubuntu')
@@ -56,6 +55,8 @@ jobs:
5655
- name: Generate example
5756
run: |
5857
melos run example:command
58+
# FIXME: https://github.com/invertase/melos/issues/117
59+
dart pub global activate build_runner
5960
melos run example:build_runner
6061
6162
- name: Check for any formatting and statically analyze the code.

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- uses: actions/checkout@v2
2626
- uses: subosito/flutter-action@v1
2727
with:
28-
flutter-version: '2.5.3'
28+
flutter-version: '2.8.1'
2929
- uses: dart-lang/setup-dart@v1
3030
with:
31-
sdk: '2.14.4'
31+
sdk: '2.15.0'
3232

3333
- name: Set environment for macos and ubuntu
3434
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
@@ -42,13 +42,13 @@ jobs:
4242
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
4343
run: |
4444
dart pub global activate melos
45-
melos run pub:get
45+
melos bootstrap
4646
4747
- name: Get dependencies for Windows
4848
if: startsWith(matrix.os, 'windows')
4949
run: |
50-
dart pub global activate melos 1.0.0-dev.3
51-
melos run pub:get
50+
dart pub global activate melos
51+
melos bootstrap
5252
5353
- name: Running build for macos
5454
if: matrix.os == 'macos-latest'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,6 @@ coverage.lcov
112112

113113
## Test resources
114114
**/test_resources/lib
115+
116+
## Melos
117+
.idea/runConfigurations/melos_*

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dart 2.14.4
2-
flutter 2.5.3-stable
1+
dart 2.15.0
2+
flutter 2.8.1-stable
33
nodejs 16.9.0
44

example/lib/freezed_sample.freezed.dart

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

example/pubspec.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ packages:
2828
name: async
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "2.8.1"
31+
version: "2.8.2"
3232
boolean_selector:
3333
dependency: transitive
3434
description:
@@ -98,7 +98,7 @@ packages:
9898
name: characters
9999
url: "https://pub.dartlang.org"
100100
source: hosted
101-
version: "1.1.0"
101+
version: "1.2.0"
102102
charcode:
103103
dependency: transitive
104104
description:
@@ -175,7 +175,7 @@ packages:
175175
name: dartx
176176
url: "https://pub.dartlang.org"
177177
source: hosted
178-
version: "0.8.0"
178+
version: "1.0.0"
179179
fake_async:
180180
dependency: transitive
181181
description:
@@ -210,7 +210,7 @@ packages:
210210
source: sdk
211211
version: "0.0.0"
212212
flutter_gen_core:
213-
dependency: "direct overridden"
213+
dependency: transitive
214214
description:
215215
path: "../packages/core"
216216
relative: true
@@ -248,14 +248,14 @@ packages:
248248
name: freezed
249249
url: "https://pub.dartlang.org"
250250
source: hosted
251-
version: "0.14.5"
251+
version: "1.0.0"
252252
freezed_annotation:
253253
dependency: "direct main"
254254
description:
255255
name: freezed_annotation
256256
url: "https://pub.dartlang.org"
257257
source: hosted
258-
version: "0.14.3"
258+
version: "1.1.0"
259259
frontend_server_client:
260260
dependency: transitive
261261
description:
@@ -318,14 +318,14 @@ packages:
318318
name: json_annotation
319319
url: "https://pub.dartlang.org"
320320
source: hosted
321-
version: "4.1.0"
321+
version: "4.4.0"
322322
json_serializable:
323323
dependency: "direct dev"
324324
description:
325325
name: json_serializable
326326
url: "https://pub.dartlang.org"
327327
source: hosted
328-
version: "5.0.2"
328+
version: "6.1.3"
329329
lints:
330330
dependency: transitive
331331
description:
@@ -346,7 +346,7 @@ packages:
346346
name: matcher
347347
url: "https://pub.dartlang.org"
348348
source: hosted
349-
version: "0.12.10"
349+
version: "0.12.11"
350350
meta:
351351
dependency: transitive
352352
description:
@@ -505,7 +505,7 @@ packages:
505505
name: test_api
506506
url: "https://pub.dartlang.org"
507507
source: hosted
508-
version: "0.4.2"
508+
version: "0.4.3"
509509
time:
510510
dependency: transitive
511511
description:
@@ -533,7 +533,7 @@ packages:
533533
name: vector_math
534534
url: "https://pub.dartlang.org"
535535
source: hosted
536-
version: "2.1.0"
536+
version: "2.1.1"
537537
watcher:
538538
dependency: transitive
539539
description:

example/pubspec.yaml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@ dependencies:
1717
flare_flutter: ^3.0.2
1818
rive: ^0.7.22
1919

20-
json_annotation: ^4.1.0
21-
freezed_annotation: ^0.14.0
20+
json_annotation: ^4.4.0
21+
freezed_annotation: ^1.0.0
2222

2323
dev_dependencies:
2424
flutter_test:
2525
sdk: flutter
2626
build_runner: ^2.1.2
27-
flutter_gen_runner:
28-
path: ../packages/runner
27+
flutter_gen_runner: ^4.1.3
2928

3029
flutter_lints: ^1.0.4
31-
json_serializable: '^5.0.0'
32-
freezed: ^0.14.0
30+
json_serializable: '^6.0.0'
31+
freezed: ^1.0.0
3332

3433
flutter_gen:
3534
output: lib/gen/ # Optional (default: lib/gen/)
@@ -97,9 +96,3 @@ flutter:
9796
- asset: assets/fonts/RobotoMono-Regular.ttf
9897
- asset: assets/fonts/RobotoMono-Bold.ttf
9998
weight: 700
100-
101-
dependency_overrides:
102-
flutter_gen_runner:
103-
path: ../packages/runner
104-
flutter_gen_core:
105-
path: ../packages/core

melos.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ scripts:
1313
run: |
1414
melos exec -- flutter pub upgrade
1515
16-
pub:get:
17-
run: |
18-
melos exec -- flutter pub get
19-
2016
analyze: melos exec -- dart analyze .
2117

2218
format: bash ./scripts/dartfmt.sh
@@ -42,9 +38,13 @@ scripts:
4238
scope: example
4339

4440
example:build_runner:
41+
# FIXME: https://github.com/invertase/melos/issues/117
42+
# run: |
43+
# melos exec \
44+
# -- flutter pub run build_runner build --delete-conflicting-outputs
4545
run: |
4646
melos exec \
47-
-- exec flutter pub run build_runner build --delete-conflicting-outputs
47+
-- dart pub global run build_runner build --delete-conflicting-outputs
4848
select-package:
4949
scope: example
5050

packages/command/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ packages:
9191
name: dartx
9292
url: "https://pub.dartlang.org"
9393
source: hosted
94-
version: "0.8.0"
94+
version: "1.0.0"
9595
file:
9696
dependency: transitive
9797
description:
@@ -126,7 +126,7 @@ packages:
126126
name: json_annotation
127127
url: "https://pub.dartlang.org"
128128
source: hosted
129-
version: "4.3.0"
129+
version: "4.4.0"
130130
lints:
131131
dependency: transitive
132132
description:

packages/command/pubspec.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,3 @@ dependencies:
1919

2020
dev_dependencies:
2121
flutter_lints: '>=1.0.4 <2.0.0'
22-
23-
# TODO: When publish to pub.dev, disabled the dependencies_override
24-
dependency_overrides:
25-
flutter_gen_core:
26-
path: ../core

0 commit comments

Comments
 (0)