Use log from pkg:build, tiny refactor

json_serializable/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 0.5.1
 
+* Use `log` exposed by `package:build`. This requires end-users to have at least
+  `package:build_runner` `^0.8.2`.
 * Updated minimum `package:source_gen` dependency to `0.8.1` which includes
   improved error messages.
 

json_serializable/lib/builder.dart

@@ -13,13 +13,9 @@
 library json_serializable.builder;
 
 import 'package:build/build.dart';
-import 'package:logging/logging.dart';
 
 import 'src/json_part_builder.dart';
 
-// TODO: until we can use `log` here - github.com/dart-lang/build/issues/1223
-final _logger = new Logger('json_serializable');
-
 /// Supports `package:build_runner` creation and configuration of `build_cli`.
 ///
 /// Not meant to be invoked by hand-authored code.
@@ -28,13 +24,16 @@ Builder jsonSerializable(BuilderOptions options) {
   // elsewhere.
   var optionsMap = new Map<String, dynamic>.from(options.config);
 
-  try {
-    return jsonPartBuilder(
-        header: optionsMap.remove('header') as String,
-        useWrappers: optionsMap.remove('use_wrappers') as bool);
-  } finally {
-    if (optionsMap.isNotEmpty) {
-      _logger.warning('These options were ignored: `$optionsMap`.');
+  var builder = jsonPartBuilder(
+      header: optionsMap.remove('header') as String,
+      useWrappers: optionsMap.remove('use_wrappers') as bool);
+
+  if (optionsMap.isNotEmpty) {
+    if (log == null) {
+      throw new StateError('Upgrade `build_runner` to at least 0.8.2.');
+    } else {
+      log.warning('These options were ignored: `$optionsMap`.');
     }
   }
+  return builder;
 }

json_serializable/lib/src/generator_helper.dart

@@ -51,7 +51,7 @@ class _GeneratorHelper {
     // We do this now, since we have a final field list after any pruning done
     // by `_writeCtor`.
     accessibleFields.fold(new Set<String>(), (Set<String> set, fe) {
-      var jsonKey = jsonKeyFor(fe).name ?? fe.name;
+      var jsonKey = _nameAccess(fe);
       if (!set.add(jsonKey)) {
         throw new InvalidGenerationSourceError(
             'More than one field has the JSON key `$jsonKey`.',
@@ -321,10 +321,10 @@ void $toJsonMapHelperName(String key, dynamic value) {
       jsonKeyFor(field).nullable ?? _annotation.nullable;
 }
 
-String _safeNameAccess(FieldElement field) {
-  var name = jsonKeyFor(field).name ?? field.name;
-  return escapeDartString(name);
-}
+String _nameAccess(FieldElement field) => jsonKeyFor(field).name ?? field.name;
+
+String _safeNameAccess(FieldElement field) =>
+    escapeDartString(_nameAccess(field));
 
 JsonSerializable _valueForAnnotation(ConstantReader annotation) =>
     new JsonSerializable(

json_serializable/pubspec.yaml

@@ -13,7 +13,6 @@ dependencies:
   # Use a tight version constraint to ensure that a constraint on
   # `json_annotation`. Properly constrains all features it provides.
   json_annotation: '>=0.2.3 <0.2.4'
-  logging: ^0.11.3
   path: ^1.3.2
   source_gen: '>=0.8.1 <0.9.0'
 dev_dependencies: