Merge remote-tracking branch 'google/master' into #780

Author: hacker1024

_test_yaml/pubspec.yaml

@@ -6,7 +6,7 @@ environment:
 
 dev_dependencies:
   build_runner: ^1.0.0
-  build_verify: ^1.1.0
+  build_verify: ^2.0.0
   checked_yaml: any
   json_annotation: any
   json_serializable: any

_test_yaml/test/ensure_build_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart=2.9
-
 @TestOn('vm')
 @Tags(['presubmit-only'])
 import 'package:build_verify/build_verify.dart';

checked_yaml/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.0.2-dev
+
 ## 2.0.1
 
 - If `CheckedFromJsonException` is caught for a key missing in the source map,

checked_yaml/pubspec.yaml

@@ -1,5 +1,5 @@
 name: checked_yaml
-version: 2.0.1
+version: 2.0.2-dev
 
 description: >-
   Generate more helpful exceptions when decoding YAML documents using
@@ -15,13 +15,8 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^1.0.0
-  build_verify: ^1.1.0
+  build_verify: ^2.0.0
   json_serializable: ^4.0.0
   path: ^1.0.0
   test: ^1.16.0
   test_process: ^2.0.0
-
-dependency_overrides:
-  # Need to update dependencies on these packages
-  build_config: ^0.4.4
-  pubspec_parse: ^0.1.5

checked_yaml/test/ensure_build_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart=2.9
-
 @TestOn('vm')
 @Tags(['presubmit-only'])
 import 'package:build_verify/build_verify.dart';

example/lib/tuple_example.g.dart

@@ -11,7 +11,7 @@ dev_dependencies:
   build_runner: ^1.0.0
 
   # Used by tests. Not required to use `json_serializable`.
-  build_verify: ^1.0.0
+  build_verify: ^2.0.0
 
   json_serializable: ^4.0.0
 

example/pubspec.yaml

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart=2.9
-
 @Tags(['presubmit-only'])
 import 'package:build_verify/build_verify.dart';
 import 'package:test/test.dart';

example/test/ensure_build_test.dart

@@ -1,7 +1,9 @@
-## 4.0.1-dev
+## 4.0.1
 
 - Fix a potential error with `checked: true` when `ArgumentError.message` is 
   `null`.
+- Updated `JsonSerializable.fromJson` to handle `null` values.
+- Deprecate `JsonSerializable` `defaults` and `withDefaults()`.
 
 ## 4.0.0
 

json_annotation/CHANGELOG.md

@@ -194,6 +194,7 @@ class JsonSerializable {
 
   /// An instance of [JsonSerializable] with all fields set to their default
   /// values.
+  @Deprecated('Was only ever included to support builder infrastructure.')
   static const defaults = JsonSerializable(
     anyMap: false,
     checked: false,
@@ -212,6 +213,7 @@ class JsonSerializable {
   ///
   /// Otherwise, the returned value has the default value as defined in
   /// [defaults].
+  @Deprecated('Was only ever included to support builder infrastructure.')
   JsonSerializable withDefaults() => JsonSerializable(
         anyMap: anyMap ?? defaults.anyMap,
         checked: checked ?? defaults.checked,