Skip to content

Commit 97c5920

Browse files
davidmorgandavidmorgan
authored
Require analyzer 10. (#1386)
* Require analyzer 10. * Release 8.12.3.
1 parent 5701511 commit 97c5920

11 files changed

Lines changed: 29 additions & 45 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
# 8.12.3
4+
5+
- Require `analyzer ^10.0.0`, stop using removed and deprecated methods from
6+
earlier versions.
7+
38
# 8.12.2
49

510
- Allow `analyzer 10.0.0`.

‎benchmark/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: benchmark
2-
version: 8.12.2
2+
version: 8.12.3
33
publish_to: none
44
description: >
55
Benchmark, not for publishing.
@@ -14,7 +14,7 @@ dependencies:
1414

1515
dev_dependencies:
1616
build_runner: '>=1.0.0 <3.0.0'
17-
built_value_generator: ^8.12.2
17+
built_value_generator: ^8.12.3
1818
pedantic: ^1.4.0
1919
quiver: '>=0.21.0 <4.0.0'
2020
test: ^1.0.0

‎built_value/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: built_value
2-
version: 8.12.2
2+
version: 8.12.3
33
description: >
44
Value types with builders, Dart classes as enums, and serialization.
55
This library is the runtime dependency.

‎built_value_generator/lib/src/enum_source_field.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ abstract class EnumSourceField
7373
var enumName = classElement.displayName;
7474
for (var fieldElement in classElement.fields) {
7575
final type = DartTypes.tryGetName(fieldElement.getter?.returnType);
76-
// TODO(davidmorgan): update when support for analyzer 9 is removed.
77-
// ignore: deprecated_member_use
78-
if (!fieldElement.isSynthetic &&
76+
if (fieldElement.isOriginDeclaration &&
7977
(type == enumName || type == 'dynamic')) {
8078
result.add(EnumSourceField(parsedLibrary, fieldElement));
8179
}

‎built_value_generator/lib/src/value_source_class.dart‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ abstract class ValueSourceClass
111111

112112
// Base class must have no fields.
113113
if (supertype.element.fields.any(
114-
// TODO(davidmorgan): update when support for analyzer 9 is removed.
115-
// ignore: deprecated_member_use
116-
(field) => !field.isStatic && !field.isSynthetic,
114+
(field) => !field.isStatic && field.isOriginDeclaration,
117115
)) {
118116
return false;
119117
}
@@ -293,9 +291,7 @@ abstract class ValueSourceClass
293291
element.constructors
294292
.where(
295293
(constructor) =>
296-
// TODO(davidmorgan): update when support for analyzer 9 is removed.
297-
// ignore: deprecated_member_use
298-
!constructor.isFactory && !constructor.isSynthetic,
294+
!constructor.isFactory && constructor.isOriginDeclaration,
299295
)
300296
.map(
301297
(constructor) => parsedLibrary
@@ -322,9 +318,7 @@ abstract class ValueSourceClass
322318
builderElement!.constructors
323319
.where(
324320
(constructor) =>
325-
// TODO(davidmorgan): update when support for analyzer 9 is removed.
326-
// ignore: deprecated_member_use
327-
!constructor.isFactory && !constructor.isSynthetic,
321+
!constructor.isFactory && constructor.isOriginDeclaration,
328322
)
329323
.map(
330324
(constructor) => parsedLibrary
@@ -552,9 +546,7 @@ abstract class ValueSourceClass
552546
GeneratorError(
553547
(b) => b
554548
..message = 'Make class implement $expectedInterface.'
555-
// TODO(davidmorgan): update when support for analyzer 8 is removed.
556-
// ignore: deprecated_member_use
557-
..offset = classDeclaration.leftBracket.offset - 1
549+
..offset = classDeclaration.body.offset - 1
558550
..length = 0
559551
..fix = 'implements $expectedInterface',
560552
),
@@ -683,9 +675,7 @@ abstract class ValueSourceClass
683675
(b) => b
684676
..message =
685677
'Make class have exactly one constructor: $expectedConstructor;'
686-
// TODO(davidmorgan): update when support for analyzer 8 is removed.
687-
// ignore: deprecated_member_use
688-
..offset = classDeclaration.rightBracket.offset
678+
..offset = classDeclaration.body.endToken.offset
689679
..length = 0
690680
..fix = ' $expectedConstructor;\n',
691681
),
@@ -713,9 +703,7 @@ abstract class ValueSourceClass
713703
(b) => b
714704
..message =
715705
'Make class have exactly one constructor: $expectedConstructor;'
716-
// TODO(davidmorgan): update when support for analyzer 8 is removed.
717-
// ignore: deprecated_member_use
718-
..offset = classDeclaration.rightBracket.offset
706+
..offset = classDeclaration.body.endToken.offset
719707
..length = 0
720708
..fix = ' $expectedConstructor;\n',
721709
),
@@ -760,9 +748,7 @@ abstract class ValueSourceClass
760748
..message =
761749
'Add a factory so your class can be instantiated. Example:\n\n'
762750
'$exampleFactory'
763-
// TODO(davidmorgan): update when support for analyzer 8 is removed.
764-
// ignore: deprecated_member_use
765-
..offset = classDeclaration.rightBracket.offset
751+
..offset = classDeclaration.body.endToken.offset
766752
..length = 0
767753
..fix = ' $exampleFactory\n',
768754
),

‎built_value_generator/lib/src/value_source_field.dart‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,8 @@ abstract class ValueSourceField
9999
}
100100

101101
@memoized
102-
// TODO(davidmorgan): update when support for analyzer 9 is removed.
103-
// ignore: deprecated_member_use
104-
bool get isGetter => element.getter != null && !element.getter!.isSynthetic;
102+
bool get isGetter =>
103+
element.getter != null && element.getter!.isOriginDeclaration;
105104

106105
@memoized
107106
bool get hasNullableAnnotation => element.getter!.metadata.annotations.any(
@@ -148,9 +147,7 @@ abstract class ValueSourceField
148147
builderFieldExists &&
149148
builderElement!.getter != null &&
150149
!builderElement!.getter!.isAbstract &&
151-
// TODO(davidmorgan): update when support for analyzer 9 is removed.
152-
// ignore: deprecated_member_use
153-
builderElement!.getter!.isSynthetic;
150+
!builderElement!.getter!.isOriginDeclaration;
154151

155152
@memoized
156153
bool get builderFieldIsGetterSetterPair =>
@@ -292,9 +289,7 @@ abstract class ValueSourceField
292289
for (var field in collectFields(classElement)) {
293290
if (!field.isStatic &&
294291
field.getter != null &&
295-
// TODO(davidmorgan): update when support for analyzer 9 is removed.
296-
// ignore: deprecated_member_use
297-
(field.getter!.isAbstract || field.getter!.isSynthetic)) {
292+
(field.getter!.isAbstract || !field.getter!.isOriginDeclaration)) {
298293
final builderField = builderClassElement?.getField(field.name!);
299294
result.add(
300295
ValueSourceField(

‎built_value_generator/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: built_value_generator
2-
version: 8.12.2
2+
version: 8.12.3
33
description: >
44
Value types with builders, Dart classes as enums, and serialization.
55
This library is the dev dependency.
@@ -13,7 +13,7 @@ environment:
1313
sdk: '>=3.6.0 <4.0.0'
1414

1515
dependencies:
16-
analyzer: '>=8.1.1 <11.0.0'
16+
analyzer: ^10.0.0
1717
build: '>=3.0.0 <5.0.0'
1818
build_config: ^1.2.0
1919
built_collection: ^5.0.0

‎built_value_test/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: built_value_test
2-
version: 8.12.2
2+
version: 8.12.3
33
description: >
44
Value types with builders, Dart classes as enums, and serialization.
55
This library provides test support.
@@ -21,7 +21,7 @@ dependencies:
2121
quiver: '>=0.21.0 <4.0.0'
2222

2323
dev_dependencies:
24-
built_value_generator: ^8.12.2
24+
built_value_generator: ^8.12.3
2525
build_runner: '>=1.0.0 <3.0.0'
2626
pedantic: ^1.4.0
2727
test: ^1.0.0

‎chat_example/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: chat_example
2-
version: 8.12.2
2+
version: 8.12.3
33
publish_to: none
44
description: >
55
Just an example, not for publishing.
@@ -21,6 +21,6 @@ dev_dependencies:
2121
build_runner: any
2222
build_test: any
2323
build_web_compilers: any
24-
built_value_generator: ^8.12.2
24+
built_value_generator: ^8.12.3
2525
pedantic: ^1.4.0
2626
test: ^1.0.0

‎end_to_end_test/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: end_to_end_test
2-
version: 8.12.2
2+
version: 8.12.3
33
publish_to: none
44
description: >
55
Tests, not for publishing.
@@ -15,7 +15,7 @@ dependencies:
1515
dev_dependencies:
1616
build: '>=3.1.0 <5.0.0'
1717
build_runner: '>=2.5.0 <3.0.0'
18-
built_value_generator: ^8.12.2
18+
built_value_generator: ^8.12.3
1919
fixnum: ^1.0.0
2020
pedantic: ^1.4.0
2121
quiver: '>=0.21.0 <4.0.0'

0 commit comments

Comments
 (0)