Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

# 8.12.2

- Allow `analyzer 10.0.0`.

# 8.12.1

- Allow `analyzer 9.0.0`.
Expand Down
4 changes: 2 additions & 2 deletions benchmark/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: benchmark
version: 8.12.1
version: 8.12.2
publish_to: none
description: >
Benchmark, not for publishing.
Expand All @@ -14,7 +14,7 @@ dependencies:

dev_dependencies:
build_runner: '>=1.0.0 <3.0.0'
built_value_generator: ^8.12.1
built_value_generator: ^8.12.2
pedantic: ^1.4.0
quiver: '>=0.21.0 <4.0.0'
test: ^1.0.0
2 changes: 1 addition & 1 deletion built_value/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: built_value
version: 8.12.1
version: 8.12.2
description: >
Value types with builders, Dart classes as enums, and serialization.
This library is the runtime dependency.
Expand Down
2 changes: 2 additions & 0 deletions built_value_generator/lib/src/enum_source_field.dart
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ abstract class EnumSourceField
var enumName = classElement.displayName;
for (var fieldElement in classElement.fields) {
final type = DartTypes.tryGetName(fieldElement.getter?.returnType);
// TODO(davidmorgan): update when support for analyzer 9 is removed.
// ignore: deprecated_member_use
if (!fieldElement.isSynthetic &&
(type == enumName || type == 'dynamic')) {
result.add(EnumSourceField(parsedLibrary, fieldElement));
Expand Down
14 changes: 14 additions & 0 deletions built_value_generator/lib/src/value_source_class.dart
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ abstract class ValueSourceClass

// Base class must have no fields.
if (supertype.element.fields.any(
// TODO(davidmorgan): update when support for analyzer 9 is removed.
// ignore: deprecated_member_use
(field) => !field.isStatic && !field.isSynthetic,
)) {
return false;
Expand Down Expand Up @@ -291,6 +293,8 @@ abstract class ValueSourceClass
element.constructors
.where(
(constructor) =>
// TODO(davidmorgan): update when support for analyzer 9 is removed.
// ignore: deprecated_member_use
!constructor.isFactory && !constructor.isSynthetic,
)
.map(
Expand Down Expand Up @@ -318,6 +322,8 @@ abstract class ValueSourceClass
builderElement!.constructors
.where(
(constructor) =>
// TODO(davidmorgan): update when support for analyzer 9 is removed.
// ignore: deprecated_member_use
!constructor.isFactory && !constructor.isSynthetic,
)
.map(
Expand Down Expand Up @@ -546,6 +552,8 @@ abstract class ValueSourceClass
GeneratorError(
(b) => b
..message = 'Make class implement $expectedInterface.'
// TODO(davidmorgan): update when support for analyzer 8 is removed.
// ignore: deprecated_member_use
..offset = classDeclaration.leftBracket.offset - 1
..length = 0
..fix = 'implements $expectedInterface',
Expand Down Expand Up @@ -675,6 +683,8 @@ abstract class ValueSourceClass
(b) => b
..message =
'Make class have exactly one constructor: $expectedConstructor;'
// TODO(davidmorgan): update when support for analyzer 8 is removed.
// ignore: deprecated_member_use
..offset = classDeclaration.rightBracket.offset
..length = 0
..fix = ' $expectedConstructor;\n',
Expand Down Expand Up @@ -703,6 +713,8 @@ abstract class ValueSourceClass
(b) => b
..message =
'Make class have exactly one constructor: $expectedConstructor;'
// TODO(davidmorgan): update when support for analyzer 8 is removed.
// ignore: deprecated_member_use
..offset = classDeclaration.rightBracket.offset
..length = 0
..fix = ' $expectedConstructor;\n',
Expand Down Expand Up @@ -748,6 +760,8 @@ abstract class ValueSourceClass
..message =
'Add a factory so your class can be instantiated. Example:\n\n'
'$exampleFactory'
// TODO(davidmorgan): update when support for analyzer 8 is removed.
// ignore: deprecated_member_use
..offset = classDeclaration.rightBracket.offset
..length = 0
..fix = ' $exampleFactory\n',
Expand Down
6 changes: 6 additions & 0 deletions built_value_generator/lib/src/value_source_field.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ abstract class ValueSourceField
}

@memoized
// TODO(davidmorgan): update when support for analyzer 9 is removed.
// ignore: deprecated_member_use
bool get isGetter => element.getter != null && !element.getter!.isSynthetic;

@memoized
Expand Down Expand Up @@ -146,6 +148,8 @@ abstract class ValueSourceField
builderFieldExists &&
builderElement!.getter != null &&
!builderElement!.getter!.isAbstract &&
// TODO(davidmorgan): update when support for analyzer 9 is removed.
// ignore: deprecated_member_use
builderElement!.getter!.isSynthetic;

@memoized
Expand Down Expand Up @@ -288,6 +292,8 @@ abstract class ValueSourceField
for (var field in collectFields(classElement)) {
if (!field.isStatic &&
field.getter != null &&
// TODO(davidmorgan): update when support for analyzer 9 is removed.
// ignore: deprecated_member_use
(field.getter!.isAbstract || field.getter!.isSynthetic)) {
final builderField = builderClassElement?.getField(field.name!);
result.add(
Expand Down
4 changes: 2 additions & 2 deletions built_value_generator/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: built_value_generator
version: 8.12.1
version: 8.12.2
description: >
Value types with builders, Dart classes as enums, and serialization.
This library is the dev dependency.
Expand All @@ -13,7 +13,7 @@ environment:
sdk: '>=3.6.0 <4.0.0'

dependencies:
analyzer: '>=8.1.1 <10.0.0'
analyzer: '>=8.1.1 <11.0.0'
build: '>=3.0.0 <5.0.0'
build_config: ^1.2.0
built_collection: ^5.0.0
Expand Down
4 changes: 2 additions & 2 deletions built_value_test/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: built_value_test
version: 8.12.1
version: 8.12.2
description: >
Value types with builders, Dart classes as enums, and serialization.
This library provides test support.
Expand All @@ -21,7 +21,7 @@ dependencies:
quiver: '>=0.21.0 <4.0.0'

dev_dependencies:
built_value_generator: ^8.12.1
built_value_generator: ^8.12.2
build_runner: '>=1.0.0 <3.0.0'
pedantic: ^1.4.0
test: ^1.0.0
4 changes: 2 additions & 2 deletions chat_example/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: chat_example
version: 8.12.1
version: 8.12.2
publish_to: none
description: >
Just an example, not for publishing.
Expand All @@ -21,6 +21,6 @@ dev_dependencies:
build_runner: any
build_test: any
build_web_compilers: any
built_value_generator: ^8.12.1
built_value_generator: ^8.12.2
pedantic: ^1.4.0
test: ^1.0.0
4 changes: 2 additions & 2 deletions end_to_end_test/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: end_to_end_test
version: 8.12.1
version: 8.12.2
publish_to: none
description: >
Tests, not for publishing.
Expand All @@ -15,7 +15,7 @@ dependencies:
dev_dependencies:
build: '>=3.1.0 <5.0.0'
build_runner: '>=2.5.0 <3.0.0'
built_value_generator: ^8.12.1
built_value_generator: ^8.12.2
fixnum: ^1.0.0
pedantic: ^1.4.0
quiver: '>=0.21.0 <4.0.0'
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:

dev_dependencies:
build_runner: '>=1.0.0 <3.0.0'
built_value_generator: ^8.12.1
built_value_generator: ^8.12.2
pedantic: ^1.4.0
quiver: '>=0.21.0 <4.0.0'
test: ^1.0.0
Loading