Skip to content

Commit ac55cd4

Browse files
kevmookevmoo
authored
Move to use (experimental) workspaces (google#1433)
1 parent ca77b65 commit ac55cd4

File tree

11 files changed

+82
-77
lines changed

11 files changed

+82
-77
lines changed

‎.github/workflows/dart.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created with package:mono_repo v6.6.1
1+
# Created with package:mono_repo v6.6.2
22
name: Dart CI
33
on:
44
push:
@@ -36,27 +36,27 @@ jobs:
3636
name: Checkout repository
3737
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
3838
- name: mono_repo self validate
39-
run: dart pub global activate mono_repo 6.6.1
39+
run: dart pub global activate mono_repo 6.6.2
4040
- name: mono_repo self validate
4141
run: dart pub global run mono_repo generate --validate
4242
job_002:
43-
name: "analyzer_and_format; Dart 3.4.0; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dart analyze`"
43+
name: "analyzer_and_format; Dart 3.5.0-259.0.dev; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dart analyze`"
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Cache Pub hosted dependencies
4747
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
4848
with:
4949
path: "~/.pub-cache/hosted"
50-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:analyze_1"
50+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:analyze_1"
5151
restore-keys: |
52-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
53-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
52+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
53+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev
5454
os:ubuntu-latest;pub-cache-hosted
5555
os:ubuntu-latest
5656
- name: Setup Dart SDK
5757
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
5858
with:
59-
sdk: "3.4.0"
59+
sdk: "3.5.0-259.0.dev"
6060
- id: checkout
6161
name: Checkout repository
6262
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -192,23 +192,23 @@ jobs:
192192
if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
193193
working-directory: json_serializable
194194
job_004:
195-
name: "unit_test; Dart 3.4.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `dart test`"
195+
name: "unit_test; Dart 3.5.0-259.0.dev; PKGS: _test_yaml, checked_yaml, example, json_serializable; `dart test`"
196196
runs-on: ubuntu-latest
197197
steps:
198198
- name: Cache Pub hosted dependencies
199199
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
200200
with:
201201
path: "~/.pub-cache/hosted"
202-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
202+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
203203
restore-keys: |
204-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_yaml-checked_yaml-example-json_serializable
205-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
204+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:_test_yaml-checked_yaml-example-json_serializable
205+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev
206206
os:ubuntu-latest;pub-cache-hosted
207207
os:ubuntu-latest
208208
- name: Setup Dart SDK
209209
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
210210
with:
211-
sdk: "3.4.0"
211+
sdk: "3.5.0-259.0.dev"
212212
- id: checkout
213213
name: Checkout repository
214214
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -253,23 +253,23 @@ jobs:
253253
- job_002
254254
- job_003
255255
job_005:
256-
name: "unit_test; Dart 3.4.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/annotation_version_test.dart`"
256+
name: "unit_test; Dart 3.5.0-259.0.dev; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/annotation_version_test.dart`"
257257
runs-on: ubuntu-latest
258258
steps:
259259
- name: Cache Pub hosted dependencies
260260
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
261261
with:
262262
path: "~/.pub-cache/hosted"
263-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:json_serializable;commands:test_3"
263+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:json_serializable;commands:test_3"
264264
restore-keys: |
265-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:json_serializable
266-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
265+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:json_serializable
266+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev
267267
os:ubuntu-latest;pub-cache-hosted
268268
os:ubuntu-latest
269269
- name: Setup Dart SDK
270270
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
271271
with:
272-
sdk: "3.4.0"
272+
sdk: "3.5.0-259.0.dev"
273273
- id: checkout
274274
name: Checkout repository
275275
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -287,23 +287,23 @@ jobs:
287287
- job_002
288288
- job_003
289289
job_006:
290-
name: "unit_test; Dart 3.4.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
290+
name: "unit_test; Dart 3.5.0-259.0.dev; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
291291
runs-on: ubuntu-latest
292292
steps:
293293
- name: Cache Pub hosted dependencies
294294
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
295295
with:
296296
path: "~/.pub-cache/hosted"
297-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:json_serializable;commands:test_1"
297+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:json_serializable;commands:test_1"
298298
restore-keys: |
299-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:json_serializable
300-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
299+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:json_serializable
300+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev
301301
os:ubuntu-latest;pub-cache-hosted
302302
os:ubuntu-latest
303303
- name: Setup Dart SDK
304304
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
305305
with:
306-
sdk: "3.4.0"
306+
sdk: "3.5.0-259.0.dev"
307307
- id: checkout
308308
name: Checkout repository
309309
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -321,23 +321,23 @@ jobs:
321321
- job_002
322322
- job_003
323323
job_007:
324-
name: "unit_test; Dart 3.4.0; PKG: json_serializable; `dart test -p chrome`"
324+
name: "unit_test; Dart 3.5.0-259.0.dev; PKG: json_serializable; `dart test -p chrome`"
325325
runs-on: ubuntu-latest
326326
steps:
327327
- name: Cache Pub hosted dependencies
328328
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
329329
with:
330330
path: "~/.pub-cache/hosted"
331-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:json_serializable;commands:test_2"
331+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:json_serializable;commands:test_2"
332332
restore-keys: |
333-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:json_serializable
334-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
333+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:json_serializable
334+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev
335335
os:ubuntu-latest;pub-cache-hosted
336336
os:ubuntu-latest
337337
- name: Setup Dart SDK
338338
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
339339
with:
340-
sdk: "3.4.0"
340+
sdk: "3.5.0-259.0.dev"
341341
- id: checkout
342342
name: Checkout repository
343343
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -518,23 +518,23 @@ jobs:
518518
- job_002
519519
- job_003
520520
job_012:
521-
name: "ensure_build; Dart 3.4.0; PKGS: _test_yaml, checked_yaml, example; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
521+
name: "ensure_build; Dart 3.5.0-259.0.dev; PKGS: _test_yaml, checked_yaml, example; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
522522
runs-on: ubuntu-latest
523523
steps:
524524
- name: Cache Pub hosted dependencies
525525
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
526526
with:
527527
path: "~/.pub-cache/hosted"
528-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_yaml-checked_yaml-example;commands:test_1"
528+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:_test_yaml-checked_yaml-example;commands:test_1"
529529
restore-keys: |
530-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_yaml-checked_yaml-example
531-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
530+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:_test_yaml-checked_yaml-example
531+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev
532532
os:ubuntu-latest;pub-cache-hosted
533533
os:ubuntu-latest
534534
- name: Setup Dart SDK
535535
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
536536
with:
537-
sdk: "3.4.0"
537+
sdk: "3.5.0-259.0.dev"
538538
- id: checkout
539539
name: Checkout repository
540540
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

‎_test_yaml/pubspec.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: _test_yaml
22
publish_to: none
33

44
environment:
5-
sdk: ^3.4.0
5+
sdk: ^3.5.0-259.0.dev
6+
7+
resolution: workspace
68

79
dev_dependencies:
810
_json_serial_shared_test:
@@ -16,11 +18,3 @@ dev_dependencies:
1618
path: ^1.8.2
1719
test: ^1.21.6
1820
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

‎checked_yaml/pubspec.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ topics:
1313
- codegen
1414

1515
environment:
16-
sdk: ^3.4.0
16+
sdk: ^3.5.0-259.0.dev
17+
18+
resolution: workspace
1719

1820
dependencies:
1921
json_annotation: ^4.3.0
@@ -28,9 +30,3 @@ dev_dependencies:
2830
path: ^1.8.0
2931
test: ^1.17.10
3032
test_process: ^2.0.0
31-
32-
#dependency_overrides:
33-
# json_annotation:
34-
# path: ../json_annotation
35-
# json_serializable:
36-
# path: ../json_serializable

‎example/pubspec.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: example
22
publish_to: none
33

44
environment:
5-
sdk: ^3.4.0
5+
sdk: ^3.5.0-259.0.dev
6+
7+
resolution: workspace
68

79
dependencies:
810
json_annotation: ^4.9.0
@@ -27,11 +29,3 @@ dev_dependencies:
2729
# Not required to use `json_serializable`.
2830
path: ^1.8.0
2931
test: ^1.21.6
30-
31-
# This section is used to verify changes to these packages. Do not include in
32-
# your code!
33-
dependency_overrides:
34-
json_annotation:
35-
path: ../json_annotation
36-
json_serializable:
37-
path: ../json_serializable

‎json_annotation/pubspec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ topics:
1111
- codegen
1212

1313
environment:
14-
sdk: ^3.4.0
14+
sdk: ^3.5.0-259.0.dev
15+
16+
resolution: workspace
1517

1618
dependencies:
1719
meta: ^1.4.0

‎json_serializable/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,15 @@ targets:
298298
[`Enum`]: https://api.dart.dev/stable/dart-core/Enum-class.html
299299
[`int`]: https://api.dart.dev/stable/dart-core/int-class.html
300300
[`Iterable`]: https://api.dart.dev/stable/dart-core/Iterable-class.html
301-
[`JsonConverter`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonConverter-class.html
302-
[`JsonEnum.valueField`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonEnum/valueField.html
303-
[`JsonEnum`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonEnum-class.html
304-
[`JsonKey.fromJson`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonKey/fromJson.html
305-
[`JsonKey.toJson`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonKey/toJson.html
306-
[`JsonKey`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonKey-class.html
307-
[`JsonLiteral`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonLiteral-class.html
308-
[`JsonSerializable`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonSerializable-class.html
309-
[`JsonValue`]: https://pub.dev/documentation/json_annotation/4.9.0/json_annotation/JsonValue-class.html
301+
[`JsonConverter`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonConverter-class.html
302+
[`JsonEnum.valueField`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonEnum/valueField.html
303+
[`JsonEnum`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonEnum-class.html
304+
[`JsonKey.fromJson`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/fromJson.html
305+
[`JsonKey.toJson`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/toJson.html
306+
[`JsonKey`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey-class.html
307+
[`JsonLiteral`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonLiteral-class.html
308+
[`JsonSerializable`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable-class.html
309+
[`JsonValue`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonValue-class.html
310310
[`List`]: https://api.dart.dev/stable/dart-core/List-class.html
311311
[`Map`]: https://api.dart.dev/stable/dart-core/Map-class.html
312312
[`num`]: https://api.dart.dev/stable/dart-core/num-class.html

‎json_serializable/pubspec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ description: >-
55
Dart classes.
66
repository: https://github.com/google/json_serializable.dart/tree/master/json_serializable
77
environment:
8-
sdk: ^3.4.0
8+
sdk: ^3.5.0-259.0.dev
99
topics:
1010
- json
1111
- build-runner
1212
- json-serializable
1313
- codegen
1414

15+
resolution: workspace
16+
1517
dependencies:
1618
analyzer: ^6.5.0
1719
async: ^2.10.0

‎json_serializable/tool/readme_builder.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@ extension on BuildStep {
154154
AssetId assetIdForInputPackage(String path) => AssetId(inputId.package, path);
155155

156156
Future<String> jsonAnnotationVersion() async {
157-
final lockFileAssetId = assetIdForInputPackage('pubspec.lock');
158-
final lockFileContent = await readAsString(lockFileAssetId);
159-
final lockFileYaml =
160-
loadYaml(lockFileContent, sourceUrl: lockFileAssetId.uri) as YamlMap;
161-
final pkgMap = lockFileYaml['packages'] as YamlMap;
162-
final jsonAnnotationMap = pkgMap['json_annotation'] as YamlMap;
163-
final jsonAnnotationVersionString = jsonAnnotationMap['version'] as String;
157+
final jsonAnnotationPubspecAssetId =
158+
AssetId('json_annotation', 'pubspec.yaml');
159+
final jsonAnnotationPubspecContent =
160+
await readAsString(jsonAnnotationPubspecAssetId);
161+
final pubspecYaml = loadYaml(jsonAnnotationPubspecContent,
162+
sourceUrl: jsonAnnotationPubspecAssetId.uri) as YamlMap;
163+
final jsonAnnotationVersionString = pubspecYaml['version'] as String;
164164

165165
final jsonAnnotationVersion =
166166
Version.parse(jsonAnnotationVersionString.trim());

‎pubspec.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: json_serial_workspace # Can be anything
2+
environment:
3+
sdk: ^3.5.0-259.0.dev # Must be ^3.5.0 or later for workspace to be allowed
4+
5+
publish_to: none
6+
7+
dev_dependencies:
8+
dart_flutter_team_lints: ^3.1.0
9+
workspace:
10+
- _test_yaml
11+
- checked_yaml
12+
- example
13+
- json_annotation
14+
- json_serializable
15+
- shared_test

‎shared_test/pubspec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: _json_serial_shared_test
22
publish_to: none
33
environment:
4-
sdk: ^3.4.0
4+
sdk: ^3.5.0-259.0.dev
5+
6+
resolution: workspace
57

68
dependencies:
79
stack_trace: ^1.10.0

‎tool/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Created with package:mono_repo v6.6.1
2+
# Created with package:mono_repo v6.6.2
33

44
# Support built in commands on windows out of the box.
55

0 commit comments

Comments
 (0)