[various] Update iOS/macOS Pigeon versions (#8226)

Updates iOS and macOS plugin implementations that were still using Pigeon 10/11 to the latest version (22). This picks up some minor improvements to serialization, as well as newer dependencies that can avoid resolver issues in flutter/flutter tests (see linked issue).

Most of this PR is auto-generated via the repo tool's `update-dependency` command; only minor manual updates were required (mostly to test code).

Fixes flutter/flutter#159803

Author: stuartmorgan-g

packages/ios_platform_images/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 0.2.4+1
 
+* Updates to Pigeon v22.
 * Updates minimum supported SDK version to Flutter 3.19/Dart 3.3.
 
 ## 0.2.4

packages/ios_platform_images/ios/ios_platform_images/Sources/ios_platform_images/messages.g.swift

@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v11.0.1), do not edit directly.
+// Autogenerated from Pigeon (v22.6.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -14,15 +14,36 @@ import Foundation
   #error("Unsupported platform.")
 #endif
 
-private func isNullish(_ value: Any?) -> Bool {
-  return value is NSNull || value == nil
+/// Error class for passing custom error details to Dart side.
+final class PigeonError: Error {
+  let code: String
+  let message: String?
+  let details: Any?
+
+  init(code: String, message: String?, details: Any?) {
+    self.code = code
+    self.message = message
+    self.details = details
+  }
+
+  var localizedDescription: String {
+    return
+      "PigeonError(code: \(code), message: \(message ?? "<nil>"), details: \(details ?? "<nil>")"
+  }
 }
 
 private func wrapResult(_ result: Any?) -> [Any?] {
   return [result]
 }
 
 private func wrapError(_ error: Any) -> [Any?] {
+  if let pigeonError = error as? PigeonError {
+    return [
+      pigeonError.code,
+      pigeonError.message,
+      pigeonError.details,
+    ]
+  }
   if let flutterError = error as? FlutterError {
     return [
       flutterError.code,
@@ -37,6 +58,10 @@ private func wrapError(_ error: Any) -> [Any?] {
   ]
 }
 
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
 private func nilOrValue<T>(_ value: Any?) -> T? {
   if value is NSNull { return nil }
   return value as! T?
@@ -51,9 +76,10 @@ struct PlatformImageData {
   /// The image's scale factor.
   var scale: Double
 
-  static func fromList(_ list: [Any?]) -> PlatformImageData? {
-    let data = list[0] as! FlutterStandardTypedData
-    let scale = list[1] as! Double
+  // swift-format-ignore: AlwaysUseLowerCamelCase
+  static func fromList(_ pigeonVar_list: [Any?]) -> PlatformImageData? {
+    let data = pigeonVar_list[0] as! FlutterStandardTypedData
+    let scale = pigeonVar_list[1] as! Double
 
     return PlatformImageData(
       data: data,
@@ -67,40 +93,41 @@ struct PlatformImageData {
     ]
   }
 }
-private class PlatformImagesApiCodecReader: FlutterStandardReader {
+
+private class messagesPigeonCodecReader: FlutterStandardReader {
   override func readValue(ofType type: UInt8) -> Any? {
     switch type {
-    case 128:
+    case 129:
       return PlatformImageData.fromList(self.readValue() as! [Any?])
     default:
       return super.readValue(ofType: type)
     }
   }
 }
 
-private class PlatformImagesApiCodecWriter: FlutterStandardWriter {
+private class messagesPigeonCodecWriter: FlutterStandardWriter {
   override func writeValue(_ value: Any) {
     if let value = value as? PlatformImageData {
-      super.writeByte(128)
+      super.writeByte(129)
       super.writeValue(value.toList())
     } else {
       super.writeValue(value)
     }
   }
 }
 
-private class PlatformImagesApiCodecReaderWriter: FlutterStandardReaderWriter {
+private class messagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
   override func reader(with data: Data) -> FlutterStandardReader {
-    return PlatformImagesApiCodecReader(data: data)
+    return messagesPigeonCodecReader(data: data)
   }
 
   override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return PlatformImagesApiCodecWriter(data: data)
+    return messagesPigeonCodecWriter(data: data)
   }
 }
 
-class PlatformImagesApiCodec: FlutterStandardMessageCodec {
-  static let shared = PlatformImagesApiCodec(readerWriter: PlatformImagesApiCodecReaderWriter())
+class messagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
+  static let shared = messagesPigeonCodec(readerWriter: messagesPigeonCodecReaderWriter())
 }
 
 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
@@ -115,14 +142,17 @@ protocol PlatformImagesApi {
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
 class PlatformImagesApiSetup {
-  /// The codec used by PlatformImagesApi.
-  static var codec: FlutterStandardMessageCodec { PlatformImagesApiCodec.shared }
+  static var codec: FlutterStandardMessageCodec { messagesPigeonCodec.shared }
   /// Sets up an instance of `PlatformImagesApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: PlatformImagesApi?) {
+  static func setUp(
+    binaryMessenger: FlutterBinaryMessenger, api: PlatformImagesApi?,
+    messageChannelSuffix: String = ""
+  ) {
+    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
     /// Returns the URL for the given resource, or null if no such resource is
     /// found.
     let resolveUrlChannel = FlutterBasicMessageChannel(
-      name: "dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.resolveUrl",
+      name: "dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.resolveUrl\(channelSuffix)",
       binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       resolveUrlChannel.setMessageHandler { message, reply in
@@ -142,7 +172,7 @@ class PlatformImagesApiSetup {
     /// Returns the data for the image resource with the given name, or null if
     /// no such resource is found.
     let loadImageChannel = FlutterBasicMessageChannel(
-      name: "dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.loadImage",
+      name: "dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.loadImage\(channelSuffix)",
       binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       loadImageChannel.setMessageHandler { message, reply in

packages/ios_platform_images/lib/src/messages.g.dart

@@ -1,16 +1,23 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v11.0.1), do not edit directly.
+// Autogenerated from Pigeon (v22.6.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
-// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
+// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 
 import 'dart:async';
 import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
 
 import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
 import 'package:flutter/services.dart';
 
+PlatformException _createConnectionError(String channelName) {
+  return PlatformException(
+    code: 'channel-error',
+    message: 'Unable to establish connection on channel: "$channelName".',
+  );
+}
+
 /// A serialization of a platform image's data.
 class PlatformImageData {
   PlatformImageData({
@@ -40,12 +47,15 @@ class PlatformImageData {
   }
 }
 
-class _PlatformImagesApiCodec extends StandardMessageCodec {
-  const _PlatformImagesApiCodec();
+class _PigeonCodec extends StandardMessageCodec {
+  const _PigeonCodec();
   @override
   void writeValue(WriteBuffer buffer, Object? value) {
-    if (value is PlatformImageData) {
-      buffer.putUint8(128);
+    if (value is int) {
+      buffer.putUint8(4);
+      buffer.putInt64(value);
+    } else if (value is PlatformImageData) {
+      buffer.putUint8(129);
       writeValue(buffer, value.encode());
     } else {
       super.writeValue(buffer, value);
@@ -55,7 +65,7 @@ class _PlatformImagesApiCodec extends StandardMessageCodec {
   @override
   Object? readValueOfType(int type, ReadBuffer buffer) {
     switch (type) {
-      case 128:
+      case 129:
         return PlatformImageData.decode(readValue(buffer)!);
       default:
         return super.readValueOfType(type, buffer);
@@ -67,60 +77,66 @@ class PlatformImagesApi {
   /// Constructor for [PlatformImagesApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  PlatformImagesApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
-  final BinaryMessenger? _binaryMessenger;
+  PlatformImagesApi(
+      {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
+      : pigeonVar_binaryMessenger = binaryMessenger,
+        pigeonVar_messageChannelSuffix =
+            messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+  final BinaryMessenger? pigeonVar_binaryMessenger;
+
+  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
 
-  static const MessageCodec<Object?> codec = _PlatformImagesApiCodec();
+  final String pigeonVar_messageChannelSuffix;
 
   /// Returns the URL for the given resource, or null if no such resource is
   /// found.
-  Future<String?> resolveUrl(
-      String arg_resourceName, String? arg_extension) async {
-    final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.resolveUrl',
-        codec,
-        binaryMessenger: _binaryMessenger);
-    final List<Object?>? replyList = await channel
-        .send(<Object?>[arg_resourceName, arg_extension]) as List<Object?>?;
-    if (replyList == null) {
-      throw PlatformException(
-        code: 'channel-error',
-        message: 'Unable to establish connection on channel.',
-      );
-    } else if (replyList.length > 1) {
+  Future<String?> resolveUrl(String resourceName, String? extension) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.resolveUrl$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_channel
+        .send(<Object?>[resourceName, extension]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
       throw PlatformException(
-        code: replyList[0]! as String,
-        message: replyList[1] as String?,
-        details: replyList[2],
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
       );
     } else {
-      return (replyList[0] as String?);
+      return (pigeonVar_replyList[0] as String?);
     }
   }
 
   /// Returns the data for the image resource with the given name, or null if
   /// no such resource is found.
-  Future<PlatformImageData?> loadImage(String arg_name) async {
-    final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.loadImage',
-        codec,
-        binaryMessenger: _binaryMessenger);
-    final List<Object?>? replyList =
-        await channel.send(<Object?>[arg_name]) as List<Object?>?;
-    if (replyList == null) {
-      throw PlatformException(
-        code: 'channel-error',
-        message: 'Unable to establish connection on channel.',
-      );
-    } else if (replyList.length > 1) {
+  Future<PlatformImageData?> loadImage(String name) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.ios_platform_images.PlatformImagesApi.loadImage$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[name]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
       throw PlatformException(
-        code: replyList[0]! as String,
-        message: replyList[1] as String?,
-        details: replyList[2],
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
       );
     } else {
-      return (replyList[0] as PlatformImageData?);
+      return (pigeonVar_replyList[0] as PlatformImageData?);
     }
   }
 }

packages/ios_platform_images/pigeons/messages.dart

@@ -7,7 +7,7 @@ import 'package:pigeon/pigeon.dart';
 @ConfigurePigeon(PigeonOptions(
   dartOut: 'lib/src/messages.g.dart',
   swiftOut:
-      'ios/ios_platform_images/Sources/ios_platform_messages/messages.g.swift',
+      'ios/ios_platform_images/Sources/ios_platform_images/messages.g.swift',
   copyrightHeader: 'pigeons/copyright.txt',
 ))
 

packages/ios_platform_images/pubspec.yaml

@@ -2,7 +2,7 @@ name: ios_platform_images
 description: A plugin to share images between Flutter and iOS in add-to-app setups.
 repository: https://github.com/flutter/packages/tree/main/packages/ios_platform_images
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+ios_platform_images%22
-version: 0.2.4
+version: 0.2.4+1
 
 environment:
   sdk: ^3.3.0
@@ -21,7 +21,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  pigeon: ^11.0.0
+  pigeon: ^22.6.4
 
 topics:
   - image

packages/ios_platform_images/test/ios_platform_images_test.dart

@@ -64,4 +64,12 @@ class FakePlatformImagesApi implements PlatformImagesApi {
     passedExtension = extension;
     return resolutionResult;
   }
+
+  @override
+  // ignore: non_constant_identifier_names
+  BinaryMessenger? get pigeonVar_binaryMessenger => null;
+
+  @override
+  // ignore: non_constant_identifier_names
+  String get pigeonVar_messageChannelSuffix => '';
 }

packages/path_provider/path_provider_foundation/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 2.4.1
 
+* Updates to Pigeon v22.
 * Updates minimum supported SDK version to Flutter 3.19/Dart 3.3.
 
 ## 2.4.0