Skip to content

Commit b7c42ad

Browse files
authored
feat(ferry_generator): move to dart_style 3.0.0 (#632)
1 parent cf35483 commit b7c42ad

File tree

45 files changed

+525
-412
lines changed

Some content is hidden

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

45 files changed

+525
-412
lines changed

packages/ferry/test/isolate/handle_command_test.mocks.dart

+29-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Mocks generated by Mockito 5.4.2 from annotations
1+
// Mocks generated by Mockito 5.4.4 from annotations
22
// in ferry/test/isolate/handle_command_test.dart.
33
// Do not manually edit this file.
44

@@ -16,6 +16,8 @@ import 'package:rxdart/rxdart.dart' as _i5;
1616
// ignore_for_file: avoid_redundant_argument_values
1717
// ignore_for_file: avoid_setters_without_getters
1818
// ignore_for_file: comment_references
19+
// ignore_for_file: deprecated_member_use
20+
// ignore_for_file: deprecated_member_use_from_same_package
1921
// ignore_for_file: implementation_imports
2022
// ignore_for_file: invalid_use_of_visible_for_testing_member
2123
// ignore_for_file: prefer_const_constructors
@@ -559,8 +561,21 @@ class MockReceivePort extends _i1.Mock implements _i4.ReceivePort {
559561
#join,
560562
[separator],
561563
),
562-
returnValue: _i3.Future<String>.value(''),
563-
returnValueForMissingStub: _i3.Future<String>.value(''),
564+
returnValue: _i3.Future<String>.value(_i7.dummyValue<String>(
565+
this,
566+
Invocation.method(
567+
#join,
568+
[separator],
569+
),
570+
)),
571+
returnValueForMissingStub:
572+
_i3.Future<String>.value(_i7.dummyValue<String>(
573+
this,
574+
Invocation.method(
575+
#join,
576+
[separator],
577+
),
578+
)),
564579
) as _i3.Future<String>);
565580

566581
@override
@@ -1035,6 +1050,17 @@ class MockCache extends _i1.Mock implements _i2.Cache {
10351050
returnValueForMissingStub: null,
10361051
);
10371052

1053+
@override
1054+
void evictOperation<TData, TVars>(
1055+
_i2.OperationRequest<TData, TVars>? request) =>
1056+
super.noSuchMethod(
1057+
Invocation.method(
1058+
#evictOperation,
1059+
[request],
1060+
),
1061+
returnValueForMissingStub: null,
1062+
);
1063+
10381064
@override
10391065
void retain(String? entityId) => super.noSuchMethod(
10401066
Invocation.method(

packages/ferry/test/typed_links/error_typed_link_test.mocks.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Mocks generated by Mockito 5.4.2 from annotations
1+
// Mocks generated by Mockito 5.4.4 from annotations
22
// in ferry/test/typed_links/error_typed_link_test.dart.
33
// Do not manually edit this file.
44

@@ -12,6 +12,8 @@ import 'package:mockito/mockito.dart' as _i1;
1212
// ignore_for_file: avoid_redundant_argument_values
1313
// ignore_for_file: avoid_setters_without_getters
1414
// ignore_for_file: comment_references
15+
// ignore_for_file: deprecated_member_use
16+
// ignore_for_file: deprecated_member_use_from_same_package
1517
// ignore_for_file: implementation_imports
1618
// ignore_for_file: invalid_use_of_visible_for_testing_member
1719
// ignore_for_file: prefer_const_constructors

packages/ferry/test/typed_links/fetch_policy_typed_link_test.mocks.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Mocks generated by Mockito 5.4.2 from annotations
1+
// Mocks generated by Mockito 5.4.4 from annotations
22
// in ferry/test/typed_links/fetch_policy_typed_link_test.dart.
33
// Do not manually edit this file.
44

@@ -13,6 +13,8 @@ import 'package:mockito/mockito.dart' as _i1;
1313
// ignore_for_file: avoid_redundant_argument_values
1414
// ignore_for_file: avoid_setters_without_getters
1515
// ignore_for_file: comment_references
16+
// ignore_for_file: deprecated_member_use
17+
// ignore_for_file: deprecated_member_use_from_same_package
1618
// ignore_for_file: implementation_imports
1719
// ignore_for_file: invalid_use_of_visible_for_testing_member
1820
// ignore_for_file: prefer_const_constructors

packages/ferry/test/typed_links/gql_typed_link_test.mocks.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Mocks generated by Mockito 5.4.2 from annotations
1+
// Mocks generated by Mockito 5.4.4 from annotations
22
// in ferry/test/typed_links/gql_typed_link_test.dart.
33
// Do not manually edit this file.
44

@@ -13,6 +13,8 @@ import 'package:mockito/mockito.dart' as _i1;
1313
// ignore_for_file: avoid_redundant_argument_values
1414
// ignore_for_file: avoid_setters_without_getters
1515
// ignore_for_file: comment_references
16+
// ignore_for_file: deprecated_member_use
17+
// ignore_for_file: deprecated_member_use_from_same_package
1618
// ignore_for_file: implementation_imports
1719
// ignore_for_file: invalid_use_of_visible_for_testing_member
1820
// ignore_for_file: prefer_const_constructors

packages/ferry/test/typed_links/update_cache_typed_link_test.mocks.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Mocks generated by Mockito 5.4.2 from annotations
1+
// Mocks generated by Mockito 5.4.4 from annotations
22
// in ferry/test/typed_links/update_cache_typed_link_test.dart.
33
// Do not manually edit this file.
44

@@ -13,6 +13,8 @@ import 'package:mockito/mockito.dart' as _i1;
1313
// ignore_for_file: avoid_redundant_argument_values
1414
// ignore_for_file: avoid_setters_without_getters
1515
// ignore_for_file: comment_references
16+
// ignore_for_file: deprecated_member_use
17+
// ignore_for_file: deprecated_member_use_from_same_package
1618
// ignore_for_file: implementation_imports
1719
// ignore_for_file: invalid_use_of_visible_for_testing_member
1820
// ignore_for_file: prefer_const_constructors

packages/ferry_generator/lib/src/utils/writer.dart

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import 'dart:async';
33
import 'package:build/build.dart';
44
import 'package:code_builder/code_builder.dart';
55
import 'package:dart_style/dart_style.dart';
6+
import 'package:pub_semver/pub_semver.dart';
67

7-
final DartFormatter _dartfmt = DartFormatter();
8+
final DartFormatter _dartfmt = DartFormatter(
9+
languageVersion: Version(3, 6, 0),
10+
);
811

912
Future<void> writeDocument(
1013
AssetId outputId,

packages/ferry_generator/pubspec.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ dependencies:
2121
path: ^1.8.0
2222
ferry_exec: ^0.7.0
2323
yaml: ^3.1.0
24-
dart_style: ^2.3.2
24+
dart_style: ^3.0.1
25+
pub_semver: ^2.0.0
2526
glob: ^2.0.1
2627
built_value_generator: ^8.1.1
2728
built_value: ^8.1.2

packages/ferry_test_external_schema/lib/graphql/__generated__/enum_from_external_schema.data.gql.g.dart

+11-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ferry_test_external_schema/lib/graphql/__generated__/enum_from_external_schema.req.gql.g.dart

+13-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ferry_test_external_schema/lib/graphql/__generated__/enum_from_external_schema.var.gql.g.dart

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ferry_test_external_schema/lib/graphql/__generated__/query_from_external_schema.data.gql.g.dart

+20-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ferry_test_external_schema/lib/graphql/__generated__/query_from_external_schema.req.gql.g.dart

+20-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ferry_test_external_schema/lib/graphql/__generated__/query_from_external_schema.var.gql.g.dart

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ferry_test_external_schema/lib/graphql/__generated__/query_list_from_external_schema.data.gql.g.dart

+11-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)