Merge branch 'main' into develop

Author: nateshmbhat

.ci.yaml

@@ -95,7 +95,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14|Mac-15.5
+      os: Mac-15.5|Mac-15.7
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -108,7 +108,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14|Mac-15.5
+      os: Mac-15.5|Mac-15.7
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-

.ci/flutter_master.version

@@ -1 +1 @@
-e5d5c01850f2d33106f00a19017682f09e83e48b
+c5e809a998fe86bb4a4502d51996504279c67ec5

packages/go_router/test/extra_codec_test.dart

@@ -7,6 +7,7 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
+import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
 
 import 'test_helpers.dart';
 
@@ -52,33 +53,40 @@ void main() {
     expect(find.text(initialString), findsOneWidget);
   });
 
-  testWidgets('Restores state correctly', (WidgetTester tester) async {
-    const String initialString = 'some string';
-    const String empty = 'empty';
-    final List<RouteBase> routes = <RouteBase>[
-      GoRoute(
-        path: '/',
-        builder: (_, GoRouterState state) {
-          return Text((state.extra as ComplexData?)?.data ?? empty);
-        },
-      ),
-    ];
+  testWidgets(
+    'Restores state correctly',
+    (WidgetTester tester) async {
+      const String initialString = 'some string';
+      const String empty = 'empty';
+      final List<RouteBase> routes = <RouteBase>[
+        GoRoute(
+          path: '/',
+          builder: (_, GoRouterState state) {
+            return Text((state.extra as ComplexData?)?.data ?? empty);
+          },
+        ),
+      ];
 
-    await createRouter(
-      routes,
-      tester,
-      initialExtra: ComplexData(initialString),
-      restorationScopeId: 'test',
-      extraCodec: ComplexDataCodec(),
-    );
-    expect(find.text(initialString), findsOneWidget);
+      await createRouter(
+        routes,
+        tester,
+        initialExtra: ComplexData(initialString),
+        restorationScopeId: 'test',
+        extraCodec: ComplexDataCodec(),
+      );
+      expect(find.text(initialString), findsOneWidget);
 
-    await tester.restartAndRestore();
-    addTearDown(tester.binding.restorationManager.dispose);
+      await tester.restartAndRestore();
 
-    await tester.pumpAndSettle();
-    expect(find.text(initialString), findsOneWidget);
-  });
+      await tester.pumpAndSettle();
+      expect(find.text(initialString), findsOneWidget);
+    },
+    // TODO(hgraceb): Remove when minimum flutter version includes
+    // https://github.com/flutter/flutter/pull/176519
+    experimentalLeakTesting: LeakTesting.settings.withIgnored(
+      classes: const <String>['TestRestorationManager', 'RestorationBucket'],
+    ),
+  );
 }
 
 class ComplexData {

packages/pigeon/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 26.0.5
+
+* [kotlin] Serialize custom enums as `Long` instead of `Int` to avoid `ClassCastException` on decoding.
+
 ## 26.0.4
 
 * Adds compatibility with `analyzer` 8.x.

packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt

@@ -142,7 +142,7 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
     when (value) {
       is Code -> {
         stream.write(129)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is MessageData -> {
         stream.write(130)

packages/pigeon/example/app/lib/main.dart

@@ -137,16 +137,14 @@ class _MyHomePageState extends State<MyHomePage> {
             if (Platform.isAndroid || Platform.isIOS)
               StreamBuilder<String>(
                 stream: getEventStream(),
-                builder: (
-                  BuildContext context,
-                  AsyncSnapshot<String> snapshot,
-                ) {
-                  if (snapshot.hasData) {
-                    return Text(snapshot.data ?? '');
-                  } else {
-                    return const CircularProgressIndicator();
-                  }
-                },
+                builder:
+                    (BuildContext context, AsyncSnapshot<String> snapshot) {
+                      if (snapshot.hasData) {
+                        return Text(snapshot.data ?? '');
+                      } else {
+                        return const CircularProgressIndicator();
+                      }
+                    },
               )
             else
               const Text('event channels are not supported on this platform'),

packages/pigeon/example/app/lib/src/messages.g.dart

@@ -143,8 +143,9 @@ class ExampleHostApi {
     BinaryMessenger? binaryMessenger,
     String messageChannelSuffix = '',
   }) : pigeonVar_binaryMessenger = binaryMessenger,
-       pigeonVar_messageChannelSuffix =
-           messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+       pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
+           ? '.$messageChannelSuffix'
+           : '';
   final BinaryMessenger? pigeonVar_binaryMessenger;
 
   static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
@@ -256,8 +257,9 @@ abstract class MessageFlutterApi {
     BinaryMessenger? binaryMessenger,
     String messageChannelSuffix = '',
   }) {
-    messageChannelSuffix =
-        messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+    messageChannelSuffix = messageChannelSuffix.isNotEmpty
+        ? '.$messageChannelSuffix'
+        : '';
     {
       final BasicMessageChannel<Object?>
       pigeonVar_channel = BasicMessageChannel<Object?>(

packages/pigeon/lib/src/generator_tools.dart

@@ -15,7 +15,7 @@ import 'generator.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '26.0.4';
+const String pigeonVersion = '26.0.5';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

packages/pigeon/lib/src/kotlin/kotlin_generator.dart

@@ -475,7 +475,9 @@ class KotlinGenerator extends StructuredGenerator<InternalKotlinOptions> {
 
     void writeEncodeLogic(EnumeratedType customType) {
       final String encodeString =
-          customType.type == CustomTypes.customClass ? 'toList()' : 'raw';
+          customType.type == CustomTypes.customClass
+              ? 'toList()'
+              : 'raw.toLong()';
       final String valueString =
           customType.enumeration < maximumCodecFieldKey
               ? 'value.$encodeString'

packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart

@@ -2983,8 +2983,8 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
 
     testWidgets('callFlutterEchoProxyApiMap', (_) async {
       final ProxyApiTestClass api = _createGenericProxyApiTestClass(
-        flutterEchoProxyApiMap:
-            (_, Map<String?, ProxyApiTestClass?> aMap) => aMap,
+        flutterEchoProxyApiMap: (_, Map<String?, ProxyApiTestClass?> aMap) =>
+            aMap,
       );
 
       final Map<String?, ProxyApiTestClass?> value =
@@ -3087,8 +3087,8 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
 
     testWidgets('callFlutterEchoNullableProxyApi', (_) async {
       final ProxyApiTestClass api = _createGenericProxyApiTestClass(
-        flutterEchoNullableProxyApi:
-            (_, ProxyApiSuperClass? aProxyApi) => aProxyApi,
+        flutterEchoNullableProxyApi: (_, ProxyApiSuperClass? aProxyApi) =>
+            aProxyApi,
       );
 
       expect(await api.callFlutterEchoNullableProxyApi(null), null);