[Pigeon] Added comment to opt out of nnbd for now (flutter#209)

* [Pigeon] Added comment to opt out of nnbd for now. * moved language directive
krmao · Sep 21, 2020 · 32d0f56 · 32d0f56
1 parent 818c483
commit 32d0f56
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.7
+
+* Fixed Dart compilation for later versions that support null safety, opting out
+  of it for now.
+
 ## 0.1.6
 
 * Fixed unused variable linter warning in Dart code under certain conditions.

diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart
@@ -133,6 +133,7 @@ void generateDart(Root root, StringSink sink) {
   indent.writeln('// $seeAlsoWarning');
   indent.writeln(
       '// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import');
+  indent.writeln('// @dart = 2.8');
   indent.writeln('import \'dart:async\';');
   indent.writeln('import \'package:flutter/services.dart\';');
   indent.writeln(

diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
@@ -8,7 +8,7 @@ import 'dart:mirrors';
 import 'ast.dart';
 
 /// The current version of pigeon.
-const String pigeonVersion = '0.1.6';
+const String pigeonVersion = '0.1.7';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
@@ -1,5 +1,5 @@
 name: pigeon
-version: 0.1.6
+version: 0.1.7
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 homepage: https://github.com/flutter/packages/tree/master/packages/pigeon
 dependencies:

diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart
@@ -180,4 +180,21 @@ void main() {
     expect(code, matches('\'${Keys.result}\': output._toMap()'));
     expect(code, contains('return <dynamic, dynamic>{};'));
   });
+
+  test('opt out of nndb', () {
+    final Class klass = Class()
+      ..name = 'Foobar'
+      ..fields = <Field>[
+        Field()
+          ..name = 'field1'
+          ..dataType = 'dataType1'
+      ];
+    final Root root = Root()
+      ..apis = <Api>[]
+      ..classes = <Class>[klass];
+    final StringBuffer sink = StringBuffer();
+    generateDart(root, sink);
+    final String code = sink.toString();
+    expect(code, contains('// @dart = 2.8'));
+  });
 }