Merge pull request #27 from davidmorgan/update-source-gen

Upgrade to source_gen 0.5.0.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.1.1
+
+- Fix error in pubspec.yaml.
+
+## 0.1.0
+
+- Upgrade to source_gen 0.5.0.
+- Breaking change; see example for required changes to build.dart.
+
 ## 0.0.7
 
 - Allow non-serializable static types provided runtime types are serializable.

built_json/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_json
-version: 0.0.7
+version: 0.1.1
 description: >
   JSON serialization for Built Collections, Built Values and Enum Classes.
   This library is the runtime dependency.

built_json_generator/lib/built_json_generator.dart

@@ -6,15 +6,17 @@ library built_json_generator;
 
 import 'dart:async';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:build/build.dart';
 import 'package:built_json_generator/src/source_library.dart';
 import 'package:source_gen/source_gen.dart';
 
 /// Generator for Built JSON.
 ///
 /// See: https://github.com/google/built_json.dart/tree/master/example
 class BuiltJsonGenerator extends Generator {
-  Future<String> generate(Element element) async {
+  @override
+  Future<String> generate(Element element, BuildStep buildStep) async {
     if (element is! LibraryElement) return null;
 
     final sourceLibrary = SourceLibrary.fromLibraryElement(element as LibraryElement);

built_json_generator/lib/src/library_elements.dart

@@ -4,7 +4,8 @@
 
 library built_json_generator.library_elements;
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/visitor.dart';
 import 'package:built_collection/built_collection.dart';
 
 /// Tools for [LibraryElement]s.
@@ -21,10 +22,8 @@ class LibraryElements {
     final result = new ListBuilder<ClassElement>();
     for (final source in libraryElement.context.librarySources) {
       final otherLibraryElement =
-          libraryElement.context.getLibraryElement(source);
-      if (otherLibraryElement != null) {
-        result.addAll(getClassElements(otherLibraryElement));
-      }
+          libraryElement.context.computeLibraryElement(source);
+      result.addAll(getClassElements(otherLibraryElement));
     }
     return result.build();
   }

built_json_generator/lib/src/source_class.dart

@@ -4,7 +4,7 @@
 
 library built_json_generator.source_class;
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_json_generator/src/source_field.dart';
 import 'package:built_value/built_value.dart';
@@ -149,9 +149,7 @@ class _\$${name}Serializer implements PrimitiveSerializer<$name> {
   }
 
   String _generateNullableFieldSerializers() {
-    return fields
-        .where((field) => field.isNullable)
-        .map((field) => '''
+    return fields.where((field) => field.isNullable).map((field) => '''
     if (object.${field.name} != null) {
       result.add('${field.name}');
       result.add(serializers.serialize(

built_json_generator/lib/src/source_class.g.dart

@@ -4,7 +4,7 @@
 
 library built_json_generator.source_field;
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
 
@@ -39,9 +39,8 @@ abstract class SourceField implements Built<SourceField, SourceFieldBuilder> {
     result.isSerializable = isSerializable;
 
     if (isSerializable) {
-      result.isNullable =
-          fieldElement.getter.metadata.any((metadata) => metadata.constantValue
-              .toStringValue() == 'nullable');
+      result.isNullable = fieldElement.getter.metadata.any(
+          (metadata) => metadata.constantValue.toStringValue() == 'nullable');
       result.name = fieldElement.displayName;
       result.type = fieldElement.getter.returnType.displayName;
       result.builderFieldUsesNestedBuilder = builderFieldElement != null &&

built_json_generator/lib/src/source_field.dart

@@ -4,7 +4,7 @@
 
 library built_json_generator.source_library;
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_json_generator/src/library_elements.dart';
 import 'package:built_json_generator/src/source_class.dart';
@@ -60,8 +60,8 @@ abstract class SourceLibrary
                 transitiveSourceClasses
                     .map((sourceClass) =>
                         sourceClass.generateTransitiveSerializerAdder() +
-                            '\n' +
-                            sourceClass.generateBuilderFactoryAdders())
+                        '\n' +
+                        sourceClass.generateBuilderFactoryAdders())
                     .join('\n') +
                 ').build();'
             : '') +