From 92d4a715104da0b2aef5cf424632f937f272faae Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Mon, 30 Nov 2020 09:45:07 -0800 Subject: [PATCH] [pigeon] Fixed running with Dart versions with NNBD enabled (moved import). --- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/bin/pigeon.dart | 4 ++-- packages/pigeon/lib/generator_tools.dart | 2 +- packages/pigeon/pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 4d2b06318f4c..fa028701c929 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.16 + +* Fixed running in certain environments where NNBD is enabled by default. + ## 0.1.15 * Added support for running in versions of Dart that support NNBD. diff --git a/packages/pigeon/bin/pigeon.dart b/packages/pigeon/bin/pigeon.dart index 8ca0d8a35b7f..25aba1f92077 100644 --- a/packages/pigeon/bin/pigeon.dart +++ b/packages/pigeon/bin/pigeon.dart @@ -33,8 +33,8 @@ Future main(List args) async { final String relInputPath = _posixRelative(opts.input, from: tempDir.path); importLine = 'import \'$relInputPath\';\n'; } - final String code = """$importLine -// @dart = 2.2 + final String code = """// @dart = 2.2 +$importLine import 'dart:io'; import 'dart:isolate'; import 'package:pigeon/pigeon_lib.dart'; diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index 387415f6ee56..447c37075c3d 100644 --- 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.15'; +const String pigeonVersion = '0.1.16'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 88d3bd71b68c..fbdd518e1cfb 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -1,5 +1,5 @@ name: pigeon -version: 0.1.15 +version: 0.1.16 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: