From 93d7f51803e12d5cdf2556c6dd2162e7da51e967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Gangs=C3=B8?= Date: Tue, 22 Aug 2023 21:28:40 +0200 Subject: [PATCH] fix: make objcOptions optional Since objcOptions and cppOptions are nullable, this makes it a bit safer. Could also be moved to the constructor. Just a hotfix for making pigeon_build_runner work without a prefix for objc, as these lines throw a null exception right now, but I made a PR to that plugin too to work around this: https://github.com/rotorgames/pigeon_build_runner/pull/1 --- packages/pigeon/lib/pigeon_lib.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/lib/pigeon_lib.dart b/packages/pigeon/lib/pigeon_lib.dart index 10a6af57b0f9..9927e2ab4a60 100644 --- a/packages/pigeon/lib/pigeon_lib.dart +++ b/packages/pigeon/lib/pigeon_lib.dart @@ -1594,13 +1594,13 @@ ${_argParser.usage}'''; if (options.objcHeaderOut != null) { options = options.merge(PigeonOptions( - objcOptions: options.objcOptions!.merge(ObjcOptions( + objcOptions: (options.objcOptions ?? ObjcOptions()).merge(ObjcOptions( headerIncludePath: path.basename(options.objcHeaderOut!))))); } if (options.cppHeaderOut != null) { options = options.merge(PigeonOptions( - cppOptions: options.cppOptions!.merge(CppOptions( + cppOptions: (options.cppOptions ?? CppOptions()).merge(CppOptions( headerIncludePath: path.basename(options.cppHeaderOut!))))); }