shelf_router_generator: Latest dependencies, null safety (google#122)

Prepare for shelf_router_generator v1
Fixes google#119

Author: kevmoo

shelf_router_generator/CHANGELOG.md

@@ -1,6 +1,7 @@
-## v1.0.0-dev
+## v1.0.0
 
  * Support update-to-date dependencies.
+ * Migrate implementation to null safety.
  * Generate null-safe code.
 
 ## v0.7.2+4

shelf_router_generator/lib/src/shelf_router_generator.dart

@@ -20,7 +20,6 @@ import 'package:analyzer/dart/element/type.dart' show ParameterizedType;
 import 'package:build/build.dart' show BuildStep, log;
 import 'package:code_builder/code_builder.dart' as code;
 import 'package:http_methods/http_methods.dart' show isHttpMethod;
-import 'package:meta/meta.dart';
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf_router/shelf_router.dart' as shelf_router;
 
@@ -49,13 +48,13 @@ List<ExecutableElement> getAnnotatedElementsOrderBySourceOffset(
     <ExecutableElement>[
       ...cls.methods.where(_routeType.hasAnnotationOfExact),
       ...cls.accessors.where(_routeType.hasAnnotationOfExact)
-    ]..sort((a, b) => (a.nameOffset ?? -1).compareTo(b.nameOffset ?? -1));
+    ]..sort((a, b) => (a.nameOffset).compareTo(b.nameOffset));
 
 /// Generate a `_$<className>Router(<className> service)` method that returns a
 /// [shelf_router.Router] configured based on annotated handlers.
 code.Method _buildRouterMethod({
-  @required ClassElement classElement,
-  @required List<_Handler> handlers,
+  required ClassElement classElement,
+  required List<_Handler> handlers,
 }) =>
     code.Method(
       (b) => b
@@ -81,9 +80,9 @@ code.Method _buildRouterMethod({
 
 /// Generate the code statement that adds [handler] from [service] to [router].
 code.Code _buildAddHandlerCode({
-  @required code.Reference router,
-  @required code.Reference service,
-  @required _Handler handler,
+  required code.Reference router,
+  required code.Reference service,
+  required _Handler handler,
 }) {
   switch (handler.verb) {
     case r'$mount':
@@ -107,7 +106,7 @@ code.Code _buildAddHandlerCode({
 
 class ShelfRouterGenerator extends g.Generator {
   @override
-  Future<String> generate(g.LibraryReader library, BuildStep buildStep) async {
+  Future<String?> generate(g.LibraryReader library, BuildStep buildStep) async {
     // Create a map from ClassElement to list of annotated elements sorted by
     // offset in source code, this is not type checked yet.
     final classes = <ClassElement, List<_Handler>>{};
@@ -120,8 +119,8 @@ class ShelfRouterGenerator extends g.Generator {
 
       classes[cls] = elements
           .map((e) => _routeType.annotationsOfExact(e).map((a) => _Handler(
-                a.getField('verb').toStringValue(),
-                a.getField('route').toStringValue(),
+                a.getField('verb')!.toStringValue()!,
+                a.getField('route')!.toStringValue()!,
                 e,
               )))
           .expand((i) => i)

shelf_router_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: shelf_router_generator
-version: 1.0.0-dev
+version: 1.0.0
 description: |
   A package:build compatible builder for generating request routers for the
   shelf web-framework based on source annotations.
@@ -10,20 +10,19 @@ issue_tracker: https://github.com/google/dart-neats/labels/pkg:shelf_router_gene
 dependencies:
   analyzer: ^1.2.0
   build: ^2.0.0
-  build_config: ^0.4.0
-  code_builder: ^3.2.0
+  build_config: ^1.0.0
+  code_builder: ^4.0.0
   http_methods: ^1.0.0
-  meta: ^1.1.7
   shelf: ^1.1.0
   shelf_router: ^1.0.0
   source_gen: ^1.0.0
 
 dev_dependencies:
-  build_runner: ^1.4.0
+  build_runner: ^2.0.0
   build_verify: ^2.0.0
   http: ^0.13.0
   pedantic: ^1.4.0
   test: ^1.5.3
 
 environment:
-  sdk: '>=2.11.99 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'