From cd7b30b42dd20ffd4b7ad61a11b5d0cc2e18793b Mon Sep 17 00:00:00 2001 From: Ajmal Kunnummal Date: Thu, 25 Mar 2021 18:21:16 -0700 Subject: [PATCH 1/3] Move exit command to bin/ from lib/ --- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/bin/pigeon.dart | 2 +- packages/pigeon/lib/generator_tools.dart | 2 +- packages/pigeon/lib/pigeon_cl.dart | 4 ++-- packages/pigeon/pubspec.yaml | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index eaa7efc0362a..64198043641e 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.25 + +* Moved exit command to bin/ from lib/ + ## 0.1.24 * Moved logic from bin/ to lib/ to help customers wrap up the behavior. diff --git a/packages/pigeon/bin/pigeon.dart b/packages/pigeon/bin/pigeon.dart index ec65f9d3eb7b..9c1cd74c07c4 100644 --- a/packages/pigeon/bin/pigeon.dart +++ b/packages/pigeon/bin/pigeon.dart @@ -7,5 +7,5 @@ import 'package:pigeon/pigeon_cl.dart'; Future main(List args) async { - await runCommandLine(args); + exit(await runCommandLine(args)); } diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index c1cf021ee9c0..44500fcfdc32 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. This must match the version in pubspec.yaml. -const String pigeonVersion = '0.2.0'; +const String pigeonVersion = '0.2.1'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/lib/pigeon_cl.dart b/packages/pigeon/lib/pigeon_cl.dart index de70005bfc5c..096c4820a2b2 100644 --- a/packages/pigeon/lib/pigeon_cl.dart +++ b/packages/pigeon/lib/pigeon_cl.dart @@ -27,7 +27,7 @@ String _posixRelative(String input, {required String from}) { /// This is the main entrypoint for the command-line tool. [args] are the /// commmand line arguments and there is an optional [packageConfig] to /// accomodate users that want to integrate pigeon with other build systems. -Future runCommandLine(List args, {Uri? packageConfig}) async { +Future runCommandLine(List args, {Uri? packageConfig}) async { final PigeonOptions opts = Pigeon.parseArgs(args); final Directory tempDir = Directory.systemTemp.createTempSync( 'flutter_pigeon.', @@ -71,5 +71,5 @@ void main(List args, SendPort sendPort) async { }); final int exitCode = await completer.future; tempDir.deleteSync(recursive: true); - exit(exitCode); + return exitCode; } diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index 8d041a398865..06278fc0e288 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -1,5 +1,5 @@ name: pigeon -version: 0.2.0 # This must match the version in lib/generator_tools.dart +version: 0.2.1 # This must match the version in lib/generator_tools.dart 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: From 19db11edf583a6ee2fb1fd506505a933257fe606 Mon Sep 17 00:00:00 2001 From: Ajmal Kunnummal Date: Fri, 26 Mar 2021 09:10:39 -0700 Subject: [PATCH 2/3] Add io import --- packages/pigeon/bin/pigeon.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pigeon/bin/pigeon.dart b/packages/pigeon/bin/pigeon.dart index 9c1cd74c07c4..a934a2c2b66f 100644 --- a/packages/pigeon/bin/pigeon.dart +++ b/packages/pigeon/bin/pigeon.dart @@ -5,6 +5,7 @@ // @dart = 2.2 import 'package:pigeon/pigeon_cl.dart'; +import 'dart:io'; Future main(List args) async { exit(await runCommandLine(args)); From 94fd924bc4476ea06bd2f9715833665a1e6f468b Mon Sep 17 00:00:00 2001 From: Ajmal Kunnummal Date: Fri, 26 Mar 2021 09:17:44 -0700 Subject: [PATCH 3/3] Fix imports --- packages/pigeon/bin/pigeon.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/bin/pigeon.dart b/packages/pigeon/bin/pigeon.dart index a934a2c2b66f..9355f575fb5a 100644 --- a/packages/pigeon/bin/pigeon.dart +++ b/packages/pigeon/bin/pigeon.dart @@ -4,8 +4,8 @@ // @dart = 2.2 -import 'package:pigeon/pigeon_cl.dart'; import 'dart:io'; +import 'package:pigeon/pigeon_cl.dart'; Future main(List args) async { exit(await runCommandLine(args));