Skip to content

Commit f671a43

Browse files
committed
Migrate built_value_test to null safety.
1 parent 4ecd76e commit f671a43

File tree

13 files changed

+69
-66
lines changed

13 files changed

+69
-66
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
# 8.3.2
4+
5+
- Migrate `built_value_test` to null safety.
6+
37
# 8.3.1
48

59
- Fix generation support for optional generic bounds, e.g.

benchmark/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: benchmark
2-
version: 8.3.1
2+
version: 8.3.2
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.3.1
17+
built_value_generator: ^8.3.2
1818
pedantic: ^1.4.0
1919
quiver: '>=0.21.0 <4.0.0'
2020
test: ^1.0.0

built_value/pubspec.yaml

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

built_value_analyzer_plugin/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: built_value_analyzer_plugin
2-
version: 8.3.1
2+
version: 8.3.2
33
description: >
44
Experimental analyzer plugin for the built_value code generator.
55
homepage: https://github.com/google/built_value.dart
@@ -11,7 +11,7 @@ dependencies:
1111
analyzer: '>=0.39.0 <0.40.0'
1212
analyzer_plugin: '>=0.1.0 <0.3.0'
1313
built_value: '>=7.0.0 <7.1.0'
14-
built_value_generator: ^8.3.1
14+
built_value_generator: ^8.3.2
1515

1616
dev_dependencies:
1717
build_test: ^0.10.3

built_value_generator/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: built_value_generator
2-
version: 8.3.1
2+
version: 8.3.2
33
description: >
44
Value types with builders, Dart classes as enums, and serialization.
55
This library is the dev dependency.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: built_value_analyzer_plugin_loader
2-
version: 8.3.1
2+
version: 8.3.2
33
description: This pubspec determines the version of the analyzer plugin to load.
44
environment:
55
sdk: '>=1.24.0-dev.1.0'
66
dependencies:
7-
built_value_analyzer_plugin: ^8.3.1
8-
built_value_generator: ^8.3.1
7+
built_value_analyzer_plugin: ^8.3.2
8+
built_value_generator: ^8.3.2

built_value_test/lib/matcher.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class _BuiltValueMatcher implements Matcher {
4646
}
4747

4848
/// Converts a Built to a map.
49-
Map<String, Object> _toMap(Object built) {
49+
Map<String, Object?> _toMap(Object? built) {
5050
// Save the current newBuiltValueToStringHelper so we can restore it on
5151
// return.
5252
final previousNewBuiltValueToStringHelper = newBuiltValueToStringHelper;
@@ -72,10 +72,10 @@ Map<String, Object> _toMap(Object built) {
7272

7373
/// Captures values in a Map instead of converting to a String.
7474
class _CapturingToStringHelper implements BuiltValueToStringHelper {
75-
final Map<String, Object> map = <String, Object>{};
75+
final Map<String, Object?> map = <String, Object?>{};
7676

7777
@override
78-
void add(String field, Object value) {
78+
void add(String field, Object? value) {
7979
if (value is Built) {
8080
map[field] = _toMap(value);
8181
} else if (value is BuiltList) {

built_value_test/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: built_value_test
2-
version: 8.3.1
2+
version: 8.3.2
33
description: >
44
Value types with builders, Dart classes as enums, and serialization.
55
This library provides test support.
66
repository: https://github.com/google/built_value.dart/tree/master/built_value_test
77

88
environment:
9-
sdk: '>=2.3.0 <3.0.0'
9+
sdk: '>=2.12.0 <3.0.0'
1010

1111
dependencies:
1212
built_value: ^8.0.0
@@ -16,7 +16,7 @@ dependencies:
1616
quiver: '>=0.21.0 <4.0.0'
1717

1818
dev_dependencies:
19-
built_value_generator: ^8.3.1
19+
built_value_generator: ^8.3.2
2020
build_runner: '>=1.0.0 <3.0.0'
2121
pedantic: ^1.4.0
2222
test: ^1.0.0

built_value_test/test/values.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ abstract class SimpleValue implements Built<SimpleValue, SimpleValueBuilder> {
2424
abstract class CompoundValue
2525
implements Built<CompoundValue, CompoundValueBuilder> {
2626
SimpleValue get simpleValue;
27-
@nullable
28-
String get string;
27+
String? get string;
2928

3029
factory CompoundValue([Function(CompoundValueBuilder) updates]) =
3130
_$CompoundValue;

built_value_test/test/values.g.dart

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

chat_example/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: chat_example
2-
version: 8.3.1
2+
version: 8.3.2
33
publish_to: none
44
description: >
55
Just an example, not for publishing.
@@ -20,6 +20,6 @@ dev_dependencies:
2020
build_runner: any
2121
build_test: any
2222
build_web_compilers: any
23-
built_value_generator: ^8.3.1
23+
built_value_generator: ^8.3.2
2424
pedantic: ^1.4.0
2525
test: ^1.0.0

end_to_end_test/pubspec.yaml

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

example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313

1414
dev_dependencies:
1515
build_runner: ^1.0.0
16-
built_value_generator: ^8.3.1
16+
built_value_generator: ^8.3.2
1717
pedantic: ^1.4.0
1818
quiver: '>=0.21.0 <4.0.0'
1919
test: ^1.0.0

0 commit comments

Comments
 (0)